diff --git a/Data/objects.xml b/Data/objects.xml index 537439ead..032240480 100644 --- a/Data/objects.xml +++ b/Data/objects.xml @@ -2894,7 +2894,7 @@ - + @@ -3588,4 +3588,4 @@ - \ No newline at end of file + diff --git a/Scripts/Engines/CannedEvil/ChampionSpawn.cs b/Scripts/Engines/CannedEvil/ChampionSpawn.cs index 6897b623a..e47f948e7 100644 --- a/Scripts/Engines/CannedEvil/ChampionSpawn.cs +++ b/Scripts/Engines/CannedEvil/ChampionSpawn.cs @@ -410,7 +410,7 @@ namespace Server.Engines.CannedEvil private ScrollofTranscendence CreateRandomSoT( bool felucca ) { int level = Utility.RandomMinMax( 1, 5 ); - + if ( felucca ) level += 5; @@ -427,7 +427,7 @@ namespace Server.Engines.CannedEvil killer.SendLocalizedMessage( 1094936 ); // You have received a Scroll of Transcendence! else killer.SendLocalizedMessage( 1049524 ); // You have received a scroll of power! - + if ( killer.Alive ) killer.AddToBackpack( scroll ); else @@ -437,13 +437,13 @@ namespace Server.Engines.CannedEvil else killer.AddToBackpack( scroll ); } - + // Justice reward PlayerMobile pm = (PlayerMobile)killer; for (int j = 0; j < pm.JusticeProtectors.Count; ++j) { Mobile prot = (Mobile)pm.JusticeProtectors[j]; - + if ( prot.Map != killer.Map || prot.Kills >= 5 || prot.Criminal || !JusticeVirtue.CheckMapRegion( killer, prot ) ) continue; @@ -463,7 +463,7 @@ namespace Server.Engines.CannedEvil prot.SendLocalizedMessage( 1049368 ); // You have been rewarded for your dedication to Justice! SpecialScroll scrollDupe = Activator.CreateInstance( scroll.GetType() ) as SpecialScroll; - + if ( scrollDupe != null ) { scrollDupe.Skill = scroll.Skill; @@ -547,7 +547,7 @@ namespace Server.Engines.CannedEvil { PlayerMobile pm = (PlayerMobile)killer; double random = Utility.Random ( 49 ); - + if ( random <= 24 ) { ScrollofTranscendence SoTF = CreateRandomSoT( true ); @@ -1258,7 +1258,7 @@ namespace Server.Engines.CannedEvil public class ChampionSpawnRegion : BaseRegion { - public override bool YoungProtected { get { return false; } } + public override bool YoungProtected => false; private ChampionSpawn m_Spawn; diff --git a/Scripts/Engines/CannedEvil/ChampionSpawnType.cs b/Scripts/Engines/CannedEvil/ChampionSpawnType.cs index 78ac3c4ee..1886ab399 100644 --- a/Scripts/Engines/CannedEvil/ChampionSpawnType.cs +++ b/Scripts/Engines/CannedEvil/ChampionSpawnType.cs @@ -78,7 +78,7 @@ namespace Server.Engines.CannedEvil } ), new ChampionSpawnInfo( "Unholy Terror", typeof( Neira ), new string[]{ "Scourge", "Punisher", "Nemesis" }, new Type[][] // Unholy Terror { // Unholy Terror - (Core.AOS ? + (Core.AOS ? new Type[]{ typeof( Bogle ), typeof( Ghoul ), typeof( Shade ), typeof( Spectre ), typeof( Wraith ) } // Level 1 (Pre-AoS) : new Type[]{ typeof( Ghoul ), typeof( Shade ), typeof( Spectre ), typeof( Wraith ) } ), // Level 1 @@ -98,7 +98,7 @@ namespace Server.Engines.CannedEvil new Type[]{ typeof( Pixie ), typeof( ShadowWisp ) }, new Type[]{ typeof( Centaur ), typeof( MLDryad ) }, new Type[]{ typeof( Satyr ), typeof( CuSidhe ) }, - new Type[]{ typeof( FerelTreefellow ), typeof( RagingGrizzlyBear ) } + new Type[]{ typeof( FeralTreefellow ), typeof( RagingGrizzlyBear ) } } ), new ChampionSpawnInfo( "The Corrupt", typeof( Ilhenir ), new string[]{ "Cleanser", "Expunger", "Depurator" } , new Type[][] { // Unholy Terror @@ -119,4 +119,4 @@ namespace Server.Engines.CannedEvil return m_Table[v]; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/ConPVP/Games/BombingRun.cs b/Scripts/Engines/ConPVP/Games/BombingRun.cs index 574b7ead5..2dc7c0ddd 100644 --- a/Scripts/Engines/ConPVP/Games/BombingRun.cs +++ b/Scripts/Engines/ConPVP/Games/BombingRun.cs @@ -13,6 +13,8 @@ namespace Server.Engines.ConPVP { public class BRBomb : Item { + public override string DefaultName => "da bomb"; + private BRGame m_Game; private Mobile m_Thrower; private EffectTimer m_Timer; @@ -33,12 +35,11 @@ namespace Server.Engines.ConPVP public BRBomb( BRGame game ) : base( 0x103C ) // 0x103C = bread, 0x1042 = pie, 0x1364 = rock, 0x13a8 = pillow, 0x2256 = bagball { - Name = "da bomb"; Movable = false; Hue = 0x35; m_Game = game; - + m_Helpers = new ArrayList(); m_Timer = new EffectTimer( this ); @@ -63,14 +64,14 @@ namespace Server.Engines.ConPVP { if ( !m_Bomb.m_Flying && m_Bomb.Map != Map.Internal ) Effects.SendLocationEffect( m_Bomb.GetWorldLocation(), m_Bomb.Map, 0x377A, 16, 10, m_Bomb.Hue, 0 ); - + if ( m_Bomb.Location != m_Bomb.m_Game.Controller.BombHome ) { if ( ++m_Count >= 30 ) { m_Bomb.m_Game.ReturnBomb(); m_Bomb.m_Game.Alert( "The bomb has been returned to it's starting point." ); - + m_Count = 0; m_Bomb.m_Helpers.Clear(); } @@ -130,7 +131,7 @@ namespace Server.Engines.ConPVP //int theifRank = mob.Skills.Stealing.Value + mob.Skills.Snooping.Value + mob.Skills.Hiding.Value + mob.Skills.Stealth.Value + mob.Skills.RemoveTrap.Value + mob.Skills.Lockpicking.Value + mob.Skills.ItemID.Value; // To Do: Give them a special ability while holding the ball maybe based on skills? - } + } } public override void OnRemoved(IEntity parent) @@ -189,7 +190,7 @@ namespace Server.Engines.ConPVP public override void OnAfterDelete() { base.OnAfterDelete (); - + if ( m_Timer != null ) m_Timer.Stop(); } @@ -266,7 +267,7 @@ namespace Server.Engines.ConPVP { if ( m_Game == null ) return true; - + if ( !IsChildOf( from.Backpack ) ) return true; @@ -297,7 +298,7 @@ namespace Server.Engines.ConPVP { DoAnim( this.GetWorldLocation(), ballLoc, this.Map ); this.MoveToWorld( ballLoc ); - + m_Path.Clear(); m_PathIdx = 0; @@ -321,7 +322,7 @@ namespace Server.Engines.ConPVP else if ( zdiff < 16 ) return Utility.RandomBool(); // 50% chance else - return false; + return false; } private void DoAnim( Point3D start, Point3D end, Map map ) @@ -465,11 +466,11 @@ namespace Server.Engines.ConPVP int xp = ( i - (count / 2) ); p.Z += (int)Math.Ceiling( coeff * xp * xp + height ); - + list[i] = p; } } - + m_Path.Clear(); for (int i = 0; i < list.Count; i++) m_Path.Add( (Point3D)list[i] ); @@ -619,7 +620,7 @@ namespace Server.Engines.ConPVP } area.Free(); - + IPooledEnumerable clients = this.Map.GetClientsInBounds( rect ); foreach ( NetState ns in clients) { @@ -630,7 +631,7 @@ namespace Server.Engines.ConPVP Point3D point; Point3D loc = m.Location; - + for ( int j = m_PathIdx; j < pathCheckEnd && !found; j++ ) { point = m_Path[j]; @@ -646,7 +647,7 @@ namespace Server.Engines.ConPVP continue; clients.Free(); - + // TODO: probably need to change this a lot... DoCatch( m ); @@ -654,7 +655,7 @@ namespace Server.Engines.ConPVP } clients.Free(); - + m_PathIdx = pathCheckEnd; if ( m_PathIdx > 0 && m_PathIdx - 1 < m_Path.Count ) @@ -670,7 +671,7 @@ namespace Server.Engines.ConPVP this.MoveToWorld( m_Path.Last ); int myZ = this.Map.GetAverageZ( this.X, this.Y ); - + StaticTile[] statics = this.Map.Tiles.GetStaticTiles( this.X, this.Y, true ); for ( int j = 0; j < statics.Length; j++ ) { @@ -737,7 +738,7 @@ namespace Server.Engines.ConPVP } m_Game.ReturnBomb(); - + m_Flying = false; this.Visible = true; m_Path.Clear(); @@ -764,7 +765,7 @@ namespace Server.Engines.ConPVP if ( m_Helpers.Contains( m ) ) m_Helpers.Remove( m ); - + if ( m_Helpers.Count > 0 ) { Mobile last = (Mobile)m_Helpers[0]; @@ -819,19 +820,19 @@ namespace Server.Engines.ConPVP // Center Sparkle this.AddComponent( new AddonComponent( 0x375A ), 0, 0, -1 ); - + if ( !m_North ) { // Pillars this.AddComponent( new AddonComponent( 0x0CE ), 0, +1, -2 ); this.AddComponent( new AddonComponent( 0x0CC ), 0, -1, -2 ); this.AddComponent( new AddonComponent( 0x0D0 ), 0, 0, -2 ); - + // Yellow parts this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, +1, 7 ); this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, 0, 16 ); this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, -1, 7 ); - + // Blue Sparkles this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, +1, 12 ); this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, +1, -1 ); @@ -844,12 +845,12 @@ namespace Server.Engines.ConPVP this.AddComponent( new AddonComponent( 0x0CF ), +1, 0, -2 ); this.AddComponent( new AddonComponent( 0x0CC ), -1, 0, -2 ); this.AddComponent( new AddonComponent( 0x0D1 ), 0, 0, -2 ); - + // Yellow parts this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), +1, 0, 7 ); this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, 0, 16 ); this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), -1, 0, 7 ); - + // Blue Sparkles this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), +1, 0, 12 ); this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), +1, 0, -1 ); @@ -858,11 +859,11 @@ namespace Server.Engines.ConPVP } } + public override string DefaultName => "Bombing Run Goal"; + [Constructible] public BRGoal() { - Name = "Bombing Run Goal"; - this.ItemID = 0x51D; this.Hue = 0x84C; this.Visible = true; @@ -905,19 +906,19 @@ namespace Server.Engines.ConPVP this.Hue = 0x84C; } - public override bool ShareHue{ get{ return false; } } + public override bool ShareHue => false; - public BRTeamInfo Team - { - get { return m_Team; } - set + public BRTeamInfo Team + { + get { return m_Team; } + set { - m_Team = value; + m_Team = value; if ( m_Team != null && m_Team.Color != 0 ) this.Hue = m_Team.Color; else this.Hue = 0x84C; - } + } } private BRTeamInfo m_Team; @@ -949,13 +950,14 @@ namespace Server.Engines.ConPVP public sealed class BRBoard : Item { + public override string DefaultName => "Scoreboard"; + public BRTeamInfo m_TeamInfo; [Constructible] public BRBoard() : base( 7774 ) { - Name = "Scoreboard"; Movable = false; } @@ -1211,7 +1213,7 @@ namespace Server.Engines.ConPVP } public int Captures - { + { get { return m_Captures; @@ -1346,9 +1348,9 @@ namespace Server.Engines.ConPVP public BRGoal Goal { get { return m_Goal; } - set + set { - m_Goal = value; + m_Goal = value; if ( m_Goal != null ) m_Goal.Team = this; } @@ -1452,10 +1454,8 @@ namespace Server.Engines.ConPVP set { m_BombHome = value; } } - public override string Title - { - get { return "Bombing Run"; } - } + public override string Title => "Bombing Run"; + public override string DefaultName => "Bombing Run Controller"; public override string GetTeamName( int teamID ) { @@ -1473,8 +1473,6 @@ namespace Server.Engines.ConPVP Visible = false; Movable = false; - Name = "Bombing Run Controller"; - m_Duration = TimeSpan.FromMinutes( 30.0 ); m_BombHome = Point3D.Zero; @@ -1943,7 +1941,7 @@ namespace Server.Engines.ConPVP } ReturnBomb(); - + if( m_Bomb != null ) m_Bomb.Delete(); diff --git a/Scripts/Engines/ConPVP/Games/DoubleDom.cs b/Scripts/Engines/ConPVP/Games/DoubleDom.cs index ddc1a24c3..888187b8d 100644 --- a/Scripts/Engines/ConPVP/Games/DoubleDom.cs +++ b/Scripts/Engines/ConPVP/Games/DoubleDom.cs @@ -355,7 +355,7 @@ namespace Server.Engines.ConPVP { if ( mob == null ) return null; - + DDPlayerInfo val; if ( !m_Players.TryGetValue( mob, out val ) ) @@ -970,13 +970,13 @@ namespace Server.Engines.ConPVP if ( point == null || from == null || team == null || !m_Capturable ) return; - bool wasDom = ( m_Controller.PointA != null && m_Controller.PointB != null && + bool wasDom = ( m_Controller.PointA != null && m_Controller.PointB != null && m_Controller.PointA.TeamOwner == m_Controller.PointB.TeamOwner && m_Controller.PointA.TeamOwner != null ); point.TeamOwner = team; Alert( "{0} has captured {1}!", team.Name, point.Name ); - bool isDom = ( m_Controller.PointA != null && m_Controller.PointB != null && + bool isDom = ( m_Controller.PointA != null && m_Controller.PointB != null && m_Controller.PointA.TeamOwner == m_Controller.PointB.TeamOwner && m_Controller.PointA.TeamOwner != null ); if ( wasDom && !isDom ) @@ -993,7 +993,7 @@ namespace Server.Engines.ConPVP m_CaptureTimer.Stop(); m_CaptureTimer = null; } - + if ( !wasDom && isDom ) { m_CapStage = 0; @@ -1010,7 +1010,7 @@ namespace Server.Engines.ConPVP team = m_Controller.PointA.TeamOwner; else if ( m_Controller.PointB != null && m_Controller.PointB.TeamOwner != null ) team = m_Controller.PointB.TeamOwner; - + if ( team == null ) { m_Capturable = true; @@ -1060,7 +1060,7 @@ namespace Server.Engines.ConPVP } private void UncaptureTick() - { + { m_Capturable = true; if ( m_CaptureTimer != null ) @@ -1134,32 +1134,32 @@ namespace Server.Engines.ConPVP int version = reader.ReadInt(); } - public override bool ShareHue{ get{ return false; } } + public override bool ShareHue => false; public DDGame Game - { - get{ return m_Game; } + { + get{ return m_Game; } set - { - m_Game = value; + { + m_Game = value; m_TeamOwner = null; - + if ( m_Game != null ) - SetNonCaptureHue(); + SetNonCaptureHue(); else SetUncapturableHue(); } } public DDTeamInfo TeamOwner - { - get{ return m_TeamOwner; } + { + get{ return m_TeamOwner; } set - { - m_TeamOwner = value; + { + m_TeamOwner = value; SetNonCaptureHue(); - } + } } public const int UncapturableHue = 0x497; diff --git a/Scripts/Engines/ConPVP/SafeZone.cs b/Scripts/Engines/ConPVP/SafeZone.cs index 244a7d798..359337262 100644 --- a/Scripts/Engines/ConPVP/SafeZone.cs +++ b/Scripts/Engines/ConPVP/SafeZone.cs @@ -10,7 +10,7 @@ namespace Server.Engines.ConPVP { public static readonly int SafeZonePriority = HouseRegion.HousePriority + 1; - /*public override bool AllowReds{ get{ return true; } }*/ + /*public override bool AllowReds => true;*/ public SafeZone( Rectangle2D area, Point3D goloc, Map map, bool isGuarded ) : base( null, map, SafeZonePriority, area ) { @@ -74,4 +74,4 @@ namespace Server.Engines.ConPVP return false; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs index a07113c90..2f231264f 100644 --- a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs +++ b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs @@ -163,14 +163,14 @@ namespace Server.Engines.Doom Movable = false; } - public override bool HandlesOnMovement { get { return true; } } + public override bool HandlesOnMovement => true; public override bool OnMoveOver( Mobile m ) { if( m != null && m is PlayerMobile ) { if ( SpellHelper.CheckCombat( m ) ) { - m.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle?? + m.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle?? } else { diff --git a/Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs b/Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs index 9de883088..a3a5783bc 100644 --- a/Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs +++ b/Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs @@ -8,14 +8,14 @@ namespace Server.Mobiles [CorpseName( "an evil corpse" )] public class UnholyFamiliar : BaseCreature { - public override bool IsDispellable { get { return false; } } - public override bool IsBondable { get { return false; } } + public override bool IsDispellable => false; + public override bool IsBondable => false; + public override string DefaultName => "a dark wolf"; [Constructible] public UnholyFamiliar() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a dark wolf"; Body = 99; BaseSoundID = 0xE5; @@ -83,4 +83,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs b/Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs index ab1ed8ac5..2313b3232 100644 --- a/Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs +++ b/Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs @@ -8,11 +8,11 @@ namespace Server.Mobiles [CorpseName( "an unholy corpse" )] public class UnholySteed : BaseMount { - public override bool IsDispellable { get { return false; } } - public override bool IsBondable { get { return false; } } + public override bool IsDispellable => false; + public override bool IsBondable => false; - public override bool HasBreath { get { return true; } } - public override bool CanBreath { get { return true; } } + public override bool HasBreath => true; + public override bool CanBreath => true; [Constructible] public UnholySteed() @@ -88,4 +88,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs b/Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs index c83c57046..2ecef7a2d 100644 --- a/Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs +++ b/Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs @@ -8,14 +8,15 @@ namespace Server.Mobiles [CorpseName( "a holy corpse" )] public class HolyFamiliar : BaseCreature { - public override bool IsDispellable { get { return false; } } - public override bool IsBondable { get { return false; } } + public override bool IsDispellable => false; + public override bool IsBondable => false; + + public override string DefaultName => "a silver wolf"; [Constructible] public HolyFamiliar() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a silver wolf"; Body = 100; BaseSoundID = 0xE5; @@ -83,4 +84,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs b/Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs index 1f678bf2d..84b66bfde 100644 --- a/Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs +++ b/Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs @@ -8,11 +8,11 @@ namespace Server.Mobiles [CorpseName( "a holy corpse" )] public class HolySteed : BaseMount { - public override bool IsDispellable { get{ return false; } } - public override bool IsBondable { get { return false; } } + public override bool IsDispellable => false; + public override bool IsBondable => false; - public override bool HasBreath { get { return true; } } - public override bool CanBreath { get { return true; } } + public override bool HasBreath => true; + public override bool CanBreath => true; [Constructible] public HolySteed() @@ -88,4 +88,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs index a4980cb38..628f9adfd 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs @@ -15,7 +15,7 @@ namespace Server.Factions private Town m_Town; private Orders m_Orders; - public override bool BardImmune{ get{ return true; } } + public override bool BardImmune => true; [CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )] public Faction Faction @@ -56,7 +56,7 @@ namespace Server.Factions } public override TimeSpan ReacquireDelay{ get{ return TimeSpan.FromSeconds( 2.0 ); } } - + public override bool IsEnemy( Mobile m ) { Faction ourFaction = m_Faction; @@ -93,7 +93,7 @@ namespace Server.Factions return false; } - + public override void OnMovement( Mobile m, Point3D oldLocation ) { if ( m.Player && m.Alive && InRange( m, 10 ) && !InRange( oldLocation, 10 ) && InLOS( m ) && m_Orders.GetReaction( Faction.Find( m ) ).Type == ReactionType.Warn ) @@ -167,7 +167,7 @@ namespace Server.Factions return ( name != null && Insensitive.StartsWith( speech, name ) ); } - + public override void OnSpeech( SpeechEventArgs e ) { base.OnSpeech( e ); @@ -406,7 +406,7 @@ namespace Server.Factions GenerateRandomHair(); } - public override bool ClickTitle{ get{ return false; } } + public override bool ClickTitle => false; public BaseFactionGuard( string title ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { @@ -512,4 +512,4 @@ namespace Server.Factions Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/Mobiles/GrimmochDrummel.cs b/Scripts/Engines/Khaldun/Mobiles/GrimmochDrummel.cs index a8b9df3be..fb2136405 100644 --- a/Scripts/Engines/Khaldun/Mobiles/GrimmochDrummel.cs +++ b/Scripts/Engines/Khaldun/Mobiles/GrimmochDrummel.cs @@ -5,9 +5,10 @@ namespace Server.Mobiles { public class GrimmochDrummel : BaseCreature { - public override bool ClickTitle{ get{ return false; } } - public override bool ShowFameTitle{ get{ return false; } } - public override bool DeleteCorpseOnDeath{ get{ return true; } } + public override bool ClickTitle => false; + public override bool ShowFameTitle => false; + public override bool DeleteCorpseOnDeath => true; + public override string DefaultName => "Grimmoch Drummel"; [Constructible] public GrimmochDrummel() : base( AIType.AI_Archer, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -16,7 +17,6 @@ namespace Server.Mobiles Hue = 0x8596; Body = 0x190; - Name = "Grimmoch Drummel"; HairItemID = 0x204A; //Krisna @@ -108,7 +108,7 @@ namespace Server.Mobiles return true; } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public GrimmochDrummel( Serial serial ) : base( serial ) { @@ -128,4 +128,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/Mobiles/LysanderGathenwale.cs b/Scripts/Engines/Khaldun/Mobiles/LysanderGathenwale.cs index 0b5ce5bb8..b42be6469 100644 --- a/Scripts/Engines/Khaldun/Mobiles/LysanderGathenwale.cs +++ b/Scripts/Engines/Khaldun/Mobiles/LysanderGathenwale.cs @@ -5,9 +5,10 @@ namespace Server.Mobiles { public class LysanderGathenwale : BaseCreature { - public override bool ClickTitle{ get{ return false; } } - public override bool ShowFameTitle{ get{ return false; } } - public override bool DeleteCorpseOnDeath{ get{ return true; } } + public override bool ClickTitle => false; + public override bool ShowFameTitle => false; + public override bool DeleteCorpseOnDeath => true; + public override string DefaultName => "Lysander Gatherwale"; [Constructible] public LysanderGathenwale() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -16,7 +17,6 @@ namespace Server.Mobiles Hue = 0x8838; Body = 0x190; - Name = "Lysander Gathenwale"; AddItem( new Boots( 0x599 ) ); AddItem( new Cloak( 0x96F ) ); @@ -109,7 +109,7 @@ namespace Server.Mobiles return true; } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public LysanderGathenwale( Serial serial ) : base( serial ) { @@ -129,4 +129,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/Mobiles/MorgBergen.cs b/Scripts/Engines/Khaldun/Mobiles/MorgBergen.cs index fc212c1e3..8cf5dab8c 100644 --- a/Scripts/Engines/Khaldun/Mobiles/MorgBergen.cs +++ b/Scripts/Engines/Khaldun/Mobiles/MorgBergen.cs @@ -5,9 +5,9 @@ namespace Server.Mobiles { public class MorgBergen : BaseCreature { - public override bool ClickTitle{ get{ return false; } } - public override bool ShowFameTitle{ get{ return false; } } - public override bool DeleteCorpseOnDeath{ get{ return true; } } + public override bool ShowFameTitle => false; + public override bool DeleteCorpseOnDeath => true; + public override string DefaultName => "Morg Bergen"; [Constructible] public MorgBergen() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -16,7 +16,6 @@ namespace Server.Mobiles Hue = 0x8596; Body = 0x190; - Name = "Morg Bergen"; AddItem( new ShortPants( 0x59C ) ); @@ -88,7 +87,7 @@ namespace Server.Mobiles return true; } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public MorgBergen( Serial serial ) : base( serial ) { @@ -108,4 +107,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/Mobiles/TavaraSewel.cs b/Scripts/Engines/Khaldun/Mobiles/TavaraSewel.cs index d49903045..615895d21 100644 --- a/Scripts/Engines/Khaldun/Mobiles/TavaraSewel.cs +++ b/Scripts/Engines/Khaldun/Mobiles/TavaraSewel.cs @@ -5,9 +5,9 @@ namespace Server.Mobiles { public class TavaraSewel : BaseCreature { - public override bool ClickTitle{ get{ return false; } } - public override bool ShowFameTitle{ get{ return false; } } - public override bool DeleteCorpseOnDeath{ get{ return true; } } + public override bool ShowFameTitle => false; + public override bool DeleteCorpseOnDeath => true; + public override string DefaultName => "Tavara Sewel"; [Constructible] public TavaraSewel () : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -17,7 +17,6 @@ namespace Server.Mobiles Hue = 0x8838; Female = true; Body = 0x191; - Name = "Tavara Sewel"; AddItem( new Kilt( 0x59C ) ); AddItem( new Sandals( 0x599 ) ); @@ -97,7 +96,7 @@ namespace Server.Mobiles return true; } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public TavaraSewel( Serial serial ) : base( serial ) { @@ -117,4 +116,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/RaiseSwitch.cs b/Scripts/Engines/Khaldun/RaiseSwitch.cs index acbb0f56c..897a18d32 100644 --- a/Scripts/Engines/Khaldun/RaiseSwitch.cs +++ b/Scripts/Engines/Khaldun/RaiseSwitch.cs @@ -162,7 +162,7 @@ namespace Server.Items { } - public override bool HandlesOnMovement{ get{ return true; } } + public override bool HandlesOnMovement => true; public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -220,4 +220,4 @@ namespace Server.Items Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Refresh ) ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs b/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs index 07386ac82..ee32201f2 100644 Binary files a/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs and b/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs differ diff --git a/Scripts/Engines/MLQuests/Definitions/Bedlam.cs b/Scripts/Engines/MLQuests/Definitions/Bedlam.cs index 62da3f043..e18eae8e9 100644 --- a/Scripts/Engines/MLQuests/Definitions/Bedlam.cs +++ b/Scripts/Engines/MLQuests/Definitions/Bedlam.cs @@ -86,13 +86,13 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Kia (Bedlam)" )] public class Kia : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Kia"; [Constructible] public Kia() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Kia"; Title = "the student"; Race = Race.Human; BodyValue = 0x191; @@ -130,9 +130,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Emerillo (Bedlam)" )] public class Emerillo : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Emerillo"; + + public override bool CanShout => true; - public override bool CanShout { get { return true; } } public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074222 ); // Could I trouble you for some assistance? @@ -142,7 +144,6 @@ namespace Server.Engines.MLQuests.Definitions public Emerillo() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Emerillo"; Title = "the cook"; Race = Race.Human; BodyValue = 0x190; @@ -181,13 +182,13 @@ namespace Server.Engines.MLQuests.Definitions public class Nythalia : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Mythalia"; [Constructible] public Nythalia() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Nythalia"; Title = "the student"; Race = Race.Human; BodyValue = 0x191; diff --git a/Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs b/Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs index c82da08ad..9b4e24bb1 100644 --- a/Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs +++ b/Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs @@ -43,7 +43,7 @@ namespace Server.Engines.MLQuests.Definitions public class ARockAndAHardPlace : MLQuest { public override Type NextQuest { get { return typeof( SympatheticMagic ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public ARockAndAHardPlace() { @@ -65,7 +65,7 @@ namespace Server.Engines.MLQuests.Definitions public class SympatheticMagic : MLQuest { public override Type NextQuest { get { return typeof( AlreadyDead ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public SympatheticMagic() { @@ -85,7 +85,7 @@ namespace Server.Engines.MLQuests.Definitions public class AlreadyDead : MLQuest { public override Type NextQuest { get { return typeof( Eureka ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public AlreadyDead() { @@ -103,7 +103,7 @@ namespace Server.Engines.MLQuests.Definitions private class InternalObjective : CollectObjective { - public override bool ShowDetailed { get { return false; } } + public override bool ShowDetailed => false; public InternalObjective() : base( 10, typeof( Bone ), 1074963 ) // (10) workable samples @@ -115,7 +115,7 @@ namespace Server.Engines.MLQuests.Definitions public class Eureka : MLQuest { public override Type NextQuest { get { return typeof( SubContracting ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public Eureka() { @@ -152,7 +152,7 @@ namespace Server.Engines.MLQuests.Definitions public class SubContracting : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public SubContracting() { @@ -178,13 +178,13 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Jamal (near Blighted Grove)" )] public class Jamal : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Jamal"; [Constructible] public Jamal() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.2, 0.4 ) { - Name = "Jamal"; Title = "the Fisherman"; Body = 400; Hue = Race.RandomSkinHue(); @@ -222,9 +222,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Iosep (Jhelom)" )] public class Iosep : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Iosep"; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -237,7 +238,6 @@ namespace Server.Engines.MLQuests.Definitions public Iosep() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.2, 0.4 ) { - Name = "Iosep"; Title = "the Exporter"; Body = 400; Hue = Race.RandomSkinHue(); diff --git a/Scripts/Engines/MLQuests/Definitions/Britannia.cs b/Scripts/Engines/MLQuests/Definitions/Britannia.cs index 6cccef28b..8086a80bf 100644 --- a/Scripts/Engines/MLQuests/Definitions/Britannia.cs +++ b/Scripts/Engines/MLQuests/Definitions/Britannia.cs @@ -42,7 +42,7 @@ namespace Server.Engines.MLQuests.Definitions public class Aemaeth2 : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public Aemaeth2() { @@ -110,13 +110,13 @@ namespace Server.Engines.MLQuests.Definitions public class Aurelia : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Aurelia"; [Constructible] public Aurelia() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Aurelia"; Title = "the Architect's Daughter"; Race = Race.Human; BodyValue = 0x191; @@ -160,13 +160,13 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Szandor" )] public class SkeletonOfSzandor : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Skeleton of Szandor"; [Constructible] public SkeletonOfSzandor() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Skeleton of Szandor"; Title = "the Late Architect"; Hue = 0x83F2; // TODO: Random human hue? Why??? Body = 0x32; diff --git a/Scripts/Engines/MLQuests/Definitions/Heartwood.cs b/Scripts/Engines/MLQuests/Definitions/Heartwood.cs index 0d3a25501..1c043e2b3 100644 --- a/Scripts/Engines/MLQuests/Definitions/Heartwood.cs +++ b/Scripts/Engines/MLQuests/Definitions/Heartwood.cs @@ -236,7 +236,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Sewerrat ) }, "sewer rats" ) ); + Objectives.Add( new KillObjective( 10, new Type[] { typeof( SewerRat ) }, "sewer rats" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -1158,7 +1158,7 @@ namespace Server.Engines.MLQuests.Definitions { Activated = true; HasRestartDelay = true; - Title = 1073901; // Hâute Couture + Title = 1073901; // Hâute Couture Description = 1074091; // Most human apparel is interesting to elven eyes. But there is one garment - the flower garland - which sounds very elven indeed. Could I see how a human crafts such an object of beauty? In exchange, I could share with you the wonders of elven garments. RefusalMessage = 1073921; // I will patiently await your reconsideration. InProgressMessage = 1073947; // I will be in your debt if you bring me flower garlands. @@ -1269,7 +1269,7 @@ namespace Server.Engines.MLQuests.Definitions Description = 1074710; // I'm working on a striking necklace -- something really unique -- and I know just what I need to finish it up. A huge fang! Won't that catch the eye? I would like to employ you to find me such an item, perhaps a snake would make the ideal donor. I'll make it worth your while, of course. RefusalMessage = 1074723; // I understand. I don't like snakes much either. They're so creepy. InProgressMessage = 1074722; // Those really big snakes like swamps, I've heard. You might try the blighted grove. - CompletionMessage = 1074721; // Do you have it? *gasp* What a tooth! Here … I must get right to work. + CompletionMessage = 1074721; // Do you have it? *gasp* What a tooth! Here � I must get right to work. Objectives.Add( new CollectObjective( 1, typeof( CoilsFang ), "coil's fang" ) ); @@ -1824,10 +1824,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Saril (The Heartwood)" )] public class Saril : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Saril"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -1840,7 +1841,6 @@ namespace Server.Engines.MLQuests.Definitions public Saril() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Saril"; Title = "the guard"; Race = Race.Elf; BodyValue = 0x25E; @@ -1885,15 +1885,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Cailla (The Heartwood)" )] public class Cailla : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Cailla"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074187, // Want a job? - 1074210 // Hi.  Looking for something to do? + 1074210 // Hi.� Looking for something to do? ) ); } @@ -1901,7 +1902,6 @@ namespace Server.Engines.MLQuests.Definitions public Cailla() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Cailla"; Title = "the guard"; Race = Race.Elf; BodyValue = 0x25E; @@ -1947,14 +1947,15 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Tamm (The Heartwood)" )] public class Tamm : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Tamm"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074213, // Hey buddy.  Looking for work? + 1074213, // Hey buddy.� Looking for work? 1074187 // Want a job? ) ); } @@ -1963,7 +1964,6 @@ namespace Server.Engines.MLQuests.Definitions public Tamm() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Tamm"; Title = "the guard"; Race = Race.Elf; BodyValue = 0x25D; @@ -2007,15 +2007,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Landy (The Heartwood)" )] public class Landy : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Landy"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074211, // I could use some help. - 1074218 // Hey!  I want to talk to you, now. + 1074218 // Hey!� I want to talk to you, now. ) ); } @@ -2023,7 +2024,6 @@ namespace Server.Engines.MLQuests.Definitions public Landy() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Landy"; Title = "the soil nurturer"; Race = Race.Elf; BodyValue = 0x25D; @@ -2068,20 +2068,20 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Elder Alejaha (The Heartwood)" )] public class Alejaha : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Elder Alejaha"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { - MLQuestSystem.Tell( this, pm, 1074223 ); // Have you done it yet?  Oh, I haven’t told you, have I? + MLQuestSystem.Tell( this, pm, 1074223 ); // Have you done it yet?� Oh, I haven�t told you, have I? } [Constructible] public Alejaha() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Alejaha"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25E; @@ -2128,15 +2128,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Mielan (The Heartwood)" )] public class Mielan : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Mielan"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074219, // Hello there, can I have a moment of your time? - 1074223 // Have you done it yet?  Oh, I haven’t told you, have I? + 1074223 // Have you done it yet?� Oh, I haven�t told you, have I? ) ); } @@ -2144,7 +2145,6 @@ namespace Server.Engines.MLQuests.Definitions public Mielan() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Mielan"; Title = "the arcanist"; Race = Race.Elf; BodyValue = 0x25D; @@ -2186,10 +2186,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Ciala (The Heartwood)" )] public class Ciala : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Ciala"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -2202,7 +2203,6 @@ namespace Server.Engines.MLQuests.Definitions public Ciala() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Ciala"; Title = "the arborist"; Race = Race.Elf; BodyValue = 0x25E; @@ -2248,14 +2248,15 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Aniel (The Heartwood)" )] public class Aniel : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Aniel"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074220, // May I call you friend?  I have a favor to beg of you. + 1074220, // May I call you friend?� I have a favor to beg of you. 1074222 // Could I trouble you for some assistance? ) ); } @@ -2264,7 +2265,6 @@ namespace Server.Engines.MLQuests.Definitions public Aniel() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Aniel"; Title = "the arborist"; Race = Race.Elf; BodyValue = 0x25D; @@ -2306,15 +2306,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Aulan (The Heartwood)" )] public class Aulan : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Aulan"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074188, // Weakling! You are not up to the task I have. - 1074191, // Just keep walking away!  I thought so. Coward!  I’ll bite your legs off! + 1074191, // Just keep walking away!� I thought so. Coward!� I�ll bite your legs off! 1074195 // You there, in the stupid hat! Come here. ) ); } @@ -2323,7 +2324,6 @@ namespace Server.Engines.MLQuests.Definitions public Aulan() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Aulan"; Title = "the expeditionist"; Race = Race.Elf; BodyValue = 0x25D; @@ -2378,14 +2378,14 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Brinnae (The Heartwood)" )] public class Brinnae : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Brinnae"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074212, // *yawn* You busy? - 1074210 // Hi.  Looking for something to do? + 1074210 // Hi.� Looking for something to do? ) ); } @@ -2393,7 +2393,6 @@ namespace Server.Engines.MLQuests.Definitions public Brinnae() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Brinnae"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25E; @@ -2433,15 +2432,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Elder Caelas (The Heartwood)" )] public class Caelas : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Elder Caelas"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074204, // Greetings seeker.  I have an urgent matter for you, if you are willing. - 1074201 // Waste not a minute! There’s work to be done. + 1074204, // Greetings seeker.� I have an urgent matter for you, if you are willing. + 1074201 // Waste not a minute! There�s work to be done. ) ); } @@ -2449,7 +2449,6 @@ namespace Server.Engines.MLQuests.Definitions public Caelas() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Caelas"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25D; @@ -2491,10 +2490,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Clehin (The Heartwood)" )] public class Clehin : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Clehin"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -2507,7 +2507,6 @@ namespace Server.Engines.MLQuests.Definitions public Clehin() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Clehin"; Title = "the soil nurturer"; Race = Race.Elf; BodyValue = 0x25E; @@ -2547,10 +2546,11 @@ namespace Server.Engines.MLQuests.Definitions public class Cloorne : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Cloorne"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -2563,7 +2563,6 @@ namespace Server.Engines.MLQuests.Definitions public Cloorne() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Cloorne"; Title = "the expeditionist"; Race = Race.Elf; BodyValue = 0x25D; @@ -2618,14 +2617,15 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Salaenih (The Heartwood)" )] public class Salaenih : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Salaenih"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074207, // Good day to you friend! Allow me to offer you a fabulous opportunity!  Thrills and adventure await! + 1074207, // Good day to you friend! Allow me to offer you a fabulous opportunity!� Thrills and adventure await! 1074209 // Hey, could you help me out with something? ) ); } @@ -2634,7 +2634,6 @@ namespace Server.Engines.MLQuests.Definitions public Salaenih() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Salaenih"; Title = "the expeditionist"; Race = Race.Elf; BodyValue = 0x25E; @@ -2696,15 +2695,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Vilo (The Heartwood)" )] public class Vilo : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Vilo"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074210, // Hi.  Looking for something to do? - 1074220 // May I call you friend?  I have a favor to beg of you. + 1074210, // Hi.� Looking for something to do? + 1074220 // May I call you friend?� I have a favor to beg of you. ) ); } @@ -2712,7 +2712,6 @@ namespace Server.Engines.MLQuests.Definitions public Vilo() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Vilo"; Title = "the guard"; Race = Race.Elf; BodyValue = 0x25D; @@ -2758,10 +2757,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Tholef (The Heartwood)" )] public class Tholef : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Tholef"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -2774,7 +2774,6 @@ namespace Server.Engines.MLQuests.Definitions public Tholef() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Tholef"; Title = "the grape tender"; Race = Race.Elf; BodyValue = 0x25D; @@ -2822,10 +2821,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Tillanil (The Heartwood)" )] public class Tillanil : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Tillanil"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -2838,7 +2838,6 @@ namespace Server.Engines.MLQuests.Definitions public Tillanil() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Tillanil"; Title = "the grape tender"; Race = Race.Elf; BodyValue = 0x25E; @@ -2879,15 +2878,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Waelian (The Heartwood)" )] public class Waelian : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Waelian"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074221, // Greetings!  I have a small task for you good traveler. - 1074201 // Waste not a minute! There’s work to be done. + 1074221, // Greetings!� I have a small task for you good traveler. + 1074201 // Waste not a minute! There�s work to be done. ) ); } @@ -2895,7 +2895,6 @@ namespace Server.Engines.MLQuests.Definitions public Waelian() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Waelian"; Title = "the trinket weaver"; Race = Race.Elf; BodyValue = 0x25D; @@ -2943,14 +2942,15 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Sleen (The Heartwood)" )] public class Sleen : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Sleen"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074200, // Thank goodness you are here, there’s no time to lose. + 1074200, // Thank goodness you are here, there�s no time to lose. 1074206 // Excuse me please traveler, might I have a little of your time? ) ); } @@ -2959,7 +2959,6 @@ namespace Server.Engines.MLQuests.Definitions public Sleen() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Sleen"; Title = "the trinket weaver"; Race = Race.Elf; BodyValue = 0x25E; @@ -3001,10 +3000,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Unoelil (The Heartwood)" )] public class Unoelil : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Unoelil"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -3017,7 +3017,6 @@ namespace Server.Engines.MLQuests.Definitions public Unoelil() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Unoelil"; Title = "the bark weaver"; Race = Race.Elf; BodyValue = 0x25E; @@ -3058,14 +3057,14 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Anolly (The Heartwood)" )] public class Anolly : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Anolly"; + public override bool CanTeach => true; [Constructible] public Anolly() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Anolly"; Title = "the bark weaver"; Race = Race.Elf; BodyValue = 0x25D; @@ -3107,15 +3106,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Jusae (The Heartwood)" )] public class Jusae : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Jusae"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074210, // Hi.  Looking for something to do? - 1074213 // Hey buddy.  Looking for work? + 1074210, // Hi.� Looking for something to do? + 1074213 // Hey buddy.� Looking for work? ) ); } @@ -3123,7 +3123,6 @@ namespace Server.Engines.MLQuests.Definitions public Jusae() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Jusae"; Title = "the bowcrafter"; Race = Race.Elf; BodyValue = 0x25D; @@ -3174,15 +3173,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Cillitha (The Heartwood)" )] public class Cillitha : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Cillitha"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074223, // Have you done it yet?  Oh, I haven’t told you, have I? - 1074213 // Hey buddy.  Looking for work? + 1074223, // Have you done it yet?� Oh, I haven�t told you, have I? + 1074213 // Hey buddy.� Looking for work? ) ); } @@ -3190,7 +3190,6 @@ namespace Server.Engines.MLQuests.Definitions public Cillitha() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Cillitha"; Title = "the bowcrafter"; Race = Race.Elf; BodyValue = 0x25E; @@ -3231,10 +3230,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Lohn (The Heartwood)" )] public class Lohn : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Lohn"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -3247,7 +3247,6 @@ namespace Server.Engines.MLQuests.Definitions public Lohn() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lohn"; Title = "the metal weaver"; Race = Race.Elf; BodyValue = 0x25D; @@ -3295,10 +3294,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Olla (The Heartwood)" )] public class Olla : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Olla"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -3311,7 +3311,6 @@ namespace Server.Engines.MLQuests.Definitions public Olla() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Olla"; Title = "the metal weaver"; Race = Race.Elf; BodyValue = 0x25E; @@ -3355,14 +3354,15 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Thallary (The Heartwood)" )] public class Thallary : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Thallary"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074221, // Greetings!  I have a small task for you good traveler. + 1074221, // Greetings!� I have a small task for you good traveler. 1074212 // *yawn* You busy? ) ); } @@ -3371,7 +3371,6 @@ namespace Server.Engines.MLQuests.Definitions public Thallary() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Thallary"; Title = "the cloth weaver"; Race = Race.Elf; BodyValue = 0x25D; @@ -3414,10 +3413,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Ahie (The Heartwood)" )] public class Ahie : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Ahie"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -3430,7 +3430,6 @@ namespace Server.Engines.MLQuests.Definitions public Ahie() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Ahie"; Title = "the cloth weaver"; Race = Race.Elf; BodyValue = 0x25E; @@ -3472,13 +3471,13 @@ namespace Server.Engines.MLQuests.Definitions public class Tyeelor : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Tyeelor"; [Constructible] public Tyeelor() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Tyeelor"; Title = "the expeditionist"; Race = Race.Elf; BodyValue = 0x25D; @@ -3536,13 +3535,13 @@ namespace Server.Engines.MLQuests.Definitions public class Athailon : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Athailon"; [Constructible] public Athailon() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Athailon"; Title = "the expeditionist"; Race = Race.Elf; BodyValue = 0x25E; @@ -3598,13 +3597,13 @@ namespace Server.Engines.MLQuests.Definitions public class ElderTaellia : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Elder Taellia"; [Constructible] public ElderTaellia() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Taellia"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25E; @@ -3643,13 +3642,13 @@ namespace Server.Engines.MLQuests.Definitions public class ElderMallew : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Elder Mallew"; [Constructible] public ElderMallew() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Mallew"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25D; @@ -3701,13 +3700,13 @@ namespace Server.Engines.MLQuests.Definitions public class ElderAbbein : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Elder Abbein"; [Constructible] public ElderAbbein() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Abbein"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25E; @@ -3745,13 +3744,13 @@ namespace Server.Engines.MLQuests.Definitions public class ElderVicaie : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Elder Vicaie"; [Constructible] public ElderVicaie() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Vicaie"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25E; @@ -3794,13 +3793,13 @@ namespace Server.Engines.MLQuests.Definitions public class ElderJothan : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Elder Jothan"; [Constructible] public ElderJothan() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Jothan"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25D; @@ -3840,13 +3839,13 @@ namespace Server.Engines.MLQuests.Definitions public class ElderAlethanian : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Elder Alethanian"; [Constructible] public ElderAlethanian() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Alethanian"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25E; @@ -3886,13 +3885,13 @@ namespace Server.Engines.MLQuests.Definitions public class Rebinil : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Rebinil"; [Constructible] public Rebinil() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Rebinil"; Title = "the healer"; Race = Race.Elf; BodyValue = 0x25E; @@ -3930,13 +3929,13 @@ namespace Server.Engines.MLQuests.Definitions public class Aluniol : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Aluniol"; [Constructible] public Aluniol() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Aluniol"; Title = "the healer"; Race = Race.Elf; BodyValue = 0x25D; @@ -3974,13 +3973,13 @@ namespace Server.Engines.MLQuests.Definitions public class Olaeni : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Olaeni"; [Constructible] public Olaeni() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Olaeni"; Title = "the thaumaturgist"; Race = Race.Elf; BodyValue = 0x25E; @@ -4019,13 +4018,13 @@ namespace Server.Engines.MLQuests.Definitions public class Bolaevin : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Bolaevin"; [Constructible] public Bolaevin() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Bolaevin"; Title = "the arcanist"; Race = Race.Elf; BodyValue = 0x25D; @@ -4070,13 +4069,13 @@ namespace Server.Engines.MLQuests.Definitions public class LorekeeperAneen : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Lorekeeper Aneen"; [Constructible] public LorekeeperAneen() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lorekeeper Aneen"; Title = "the keeper of tradition"; Race = Race.Elf; BodyValue = 0x25D; @@ -4114,13 +4113,13 @@ namespace Server.Engines.MLQuests.Definitions public class Daelas : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Daelas"; [Constructible] public Daelas() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Daelas"; Title = "the arborist"; Race = Race.Elf; BodyValue = 0x25D; @@ -4167,13 +4166,13 @@ namespace Server.Engines.MLQuests.Definitions public class Alelle : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Alelle"; [Constructible] public Alelle() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Alelle"; Title = "the arborist"; Race = Race.Elf; BodyValue = 0x25E; @@ -4224,14 +4223,14 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Nillaen (The Heartwood)" )] public class LorekeeperNillaen : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Lorekeeper Nillaen"; + public override bool CanTeach => true; [Constructible] public LorekeeperNillaen() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lorekeeper Nillaen"; Title = "the keeper of tradition"; Race = Race.Elf; BodyValue = 0x25E; @@ -4275,15 +4274,16 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Ryal (The Heartwood)" )] public class LorekeeperRyal : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Lorekeeper Ryal"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074204, // Greetings seeker.  I have an urgent matter for you, if you are willing. - 1074200 // Thank goodness you are here, there’s no time to lose. + 1074204, // Greetings seeker.� I have an urgent matter for you, if you are willing. + 1074200 // Thank goodness you are here, there�s no time to lose. ) ); } @@ -4291,7 +4291,6 @@ namespace Server.Engines.MLQuests.Definitions public LorekeeperRyal() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lorekeeper Ryal"; Title = "the keeper of tradition"; Race = Race.Elf; BodyValue = 0x25D; @@ -4334,10 +4333,11 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Braen (The Heartwood)" )] public class Braen : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Braen"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074187 ); // Want a job? @@ -4347,7 +4347,6 @@ namespace Server.Engines.MLQuests.Definitions public Braen() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Braen"; Title = "the thaumaturgist"; Race = Race.Elf; BodyValue = 0x25D; @@ -4388,20 +4387,20 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Elder Acob (The Heartwood)" )] public class ElderAcob : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Elder Acob"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { - MLQuestSystem.Tell( this, pm, 1074197 ); // Pardon me, but if you could spare some time I’d greatly appreciate it. + MLQuestSystem.Tell( this, pm, 1074197 ); // Pardon me, but if you could spare some time I�d greatly appreciate it. } [Constructible] public ElderAcob() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Acob"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25D; @@ -4441,20 +4440,20 @@ namespace Server.Engines.MLQuests.Definitions public class LorekeeperCalendor : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Lorekeeper Calendor"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { - MLQuestSystem.Tell( this, pm, 1074204 ); // Greetings seeker.  I have an urgent matter for you, if you are willing. + MLQuestSystem.Tell( this, pm, 1074204 ); // Greetings seeker.� I have an urgent matter for you, if you are willing. } [Constructible] public LorekeeperCalendor() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lorekeeper Calendor"; Title = "the keeper of tradition"; Race = Race.Elf; BodyValue = 0x25E; @@ -4495,10 +4494,11 @@ namespace Server.Engines.MLQuests.Definitions public class LorekeeperSiarra : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Lorekeeper Siarra"; + public override bool CanTeach => true; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074206 ); // Excuse me please traveler, might I have a little of your time? @@ -4508,7 +4508,6 @@ namespace Server.Engines.MLQuests.Definitions public LorekeeperSiarra() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lorekeeper Siarra"; Title = "the keeper of tradition"; Race = Race.Elf; BodyValue = 0x25E; diff --git a/Scripts/Engines/MLQuests/Definitions/Heritage.cs b/Scripts/Engines/MLQuests/Definitions/Heritage.cs index ff9a73142..2c2ea2c99 100644 --- a/Scripts/Engines/MLQuests/Definitions/Heritage.cs +++ b/Scripts/Engines/MLQuests/Definitions/Heritage.cs @@ -13,7 +13,7 @@ namespace Server.Engines.MLQuests.Definitions public class Seasons : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public Seasons() { @@ -49,7 +49,7 @@ namespace Server.Engines.MLQuests.Definitions public class CaretakerOfTheLand : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public CaretakerOfTheLand() { @@ -85,7 +85,7 @@ namespace Server.Engines.MLQuests.Definitions public class WisdomOfTheSphynx : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public WisdomOfTheSphynx() { @@ -117,7 +117,7 @@ namespace Server.Engines.MLQuests.Definitions private class InternalObjective : CollectObjective { - public override bool ShowDetailed { get { return false; } } + public override bool ShowDetailed => false; public InternalObjective() : base( 1, typeof( Pitcher ), 1074869 ) // The answer to the riddle. @@ -135,7 +135,7 @@ namespace Server.Engines.MLQuests.Definitions public class DefendingTheHerd : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public DefendingTheHerd() { @@ -171,7 +171,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheBalanceOfNature : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public TheBalanceOfNature() { @@ -206,7 +206,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheJoysOfLife : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public TheJoysOfLife() { @@ -246,12 +246,12 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Maul" )] public class MaulTheBear : GrizzlyBear { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Maul"; [Constructible] public MaulTheBear() { - Name = "Maul"; AI = AIType.AI_Vendor; FightMode = FightMode.None; Tamable = false; @@ -279,12 +279,12 @@ namespace Server.Engines.MLQuests.Definitions public class Strongroot : Treefellow { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Strongroot"; [Constructible] public Strongroot() { - Name = "Strongroot"; AI = AIType.AI_Vendor; FightMode = FightMode.None; } @@ -311,13 +311,13 @@ namespace Server.Engines.MLQuests.Definitions public class Enigma : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Enigma"; [Constructible] public Enigma() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Enigma"; BodyValue = 788; BaseSoundID = 0x3EE; @@ -346,8 +346,9 @@ namespace Server.Engines.MLQuests.Definitions public class Bravehorn : BaseEscortable { - public override bool StaticMLQuester { get { return true; } } - public override bool InitialInnocent { get { return true; } } + public override bool StaticMLQuester => true; + public override bool InitialInnocent => true; + public override string DefaultName => "Bravehorn"; [Constructible] public Bravehorn() @@ -356,7 +357,6 @@ namespace Server.Engines.MLQuests.Definitions public override void InitBody() { - Name = "Bravehorn"; Body = 0xEA; SetStr( 41, 71 ); @@ -424,10 +424,11 @@ namespace Server.Engines.MLQuests.Definitions public class BravehornsMate : Hind { + public override string DefaultName => "bravehorn's mate"; + [Constructible] public BravehornsMate() { - Name = "bravehorn's mate"; Tamable = false; } @@ -453,12 +454,12 @@ namespace Server.Engines.MLQuests.Definitions public class Huntsman : Centaur { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Huntsman"; [Constructible] public Huntsman() { - Name = "Huntsman"; AI = AIType.AI_Vendor; FightMode = FightMode.None; } @@ -485,12 +486,12 @@ namespace Server.Engines.MLQuests.Definitions public class Arielle : Pixie { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Arielle"; [Constructible] public Arielle() { - Name = "Arielle"; AI = AIType.AI_Vendor; FightMode = FightMode.None; } @@ -521,7 +522,7 @@ namespace Server.Engines.MLQuests.Definitions public class Ingenuity : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public Ingenuity() { @@ -558,7 +559,7 @@ namespace Server.Engines.MLQuests.Definitions public class HeaveHo : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public HeaveHo() { @@ -593,7 +594,7 @@ namespace Server.Engines.MLQuests.Definitions // This is not a real quest, it is only used as a reference public class HumanInNeed : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public HumanInNeed() { @@ -612,7 +613,7 @@ namespace Server.Engines.MLQuests.Definitions public class AllSeasonAdventurer : MLQuest { - public override bool RecordCompletion { get { return true; } } + public override bool RecordCompletion => true; public AllSeasonAdventurer() { @@ -651,9 +652,9 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Sledge (Buc's Den)" )] public class Sledge : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Sledge"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -666,7 +667,6 @@ namespace Server.Engines.MLQuests.Definitions public Sledge() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Sledge"; Title = "the Versatile"; Body = 400; Hue = Race.RandomSkinHue(); @@ -702,13 +702,13 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Patricus (Vesper)" )] public class Patricus : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Patricus"; [Constructible] public Patricus() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Patricus"; Title = "the Trader"; Body = 400; Hue = Race.RandomSkinHue(); @@ -744,9 +744,9 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Belulah (Nujel'm)" )] // On OSI it's "Belulah (Nu'Jelm)" (incorrect spelling) public class Belulah : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Belulah"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { /* @@ -760,7 +760,6 @@ namespace Server.Engines.MLQuests.Definitions public Belulah() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Belulah"; Title = "the scorned"; Female = true; Body = 401; diff --git a/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs b/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs index e8bf73bd9..4921dc9fb 100644 --- a/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs +++ b/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs @@ -22,13 +22,13 @@ namespace Server.Engines.MLQuests.Definitions Title = 1075392; // Honest Beggar Description = 1075393; // Beg pardon, sir. I mean, madam. Uh, can I ask a favor of you? I found this jeweled ring. Most people would sell it and keep the money, but not me. I ain't never stole nothing, and I ain't about to start. I tried to take it over to Brit castle, figgerin' it must belong to some highborn lady, but the guards threw me out. You look like they might let you pass. Will you take the ring over there and see if you can find the owner? RefusalMessage = 1075395; // I see. Too good to help an honest beggar like me, eh? - InProgressMessage = 1075396; // A jewel like this must be worth a lot, so it must belong to some noble or another. I would show it around the castle. Someone’s bound to recognize it. + InProgressMessage = 1075396; // A jewel like this must be worth a lot, so it must belong to some noble or another. I would show it around the castle. Someone�s bound to recognize it. CompletionMessage = 1075397; // Didst thou find my ring? I thank thee very much! It is an old ring, and a gift from my husband. I was most distraught when I realized it was missing. CompletionNotice = CompletionNoticeShort; Objectives.Add( new DeliverObjective( typeof( ReginasRing ), 1, "Regina's Ring", typeof( Regina ) ) ); - Rewards.Add( new DummyReward( 1075394 ) ); // Find the ring’s owner. + Rewards.Add( new DummyReward( 1075394 ) ); // Find the ring�s owner. } public override void Generate() @@ -42,14 +42,14 @@ namespace Server.Engines.MLQuests.Definitions public class ReginasThanks : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public ReginasThanks() { Activated = true; OneTimeOnly = true; - Title = 1075398; // Regina’s Thanks - Description = 1075399; // What’s that you say? It was a humble beggar that found my ring? Such honesty must be rewarded. Here, take this packet and return it to him, and I will be in your debt. + Title = 1075398; // Regina�s Thanks + Description = 1075399; // What�s that you say? It was a humble beggar that found my ring? Such honesty must be rewarded. Here, take this packet and return it to him, and I will be in your debt. RefusalMessage = 1075401; // Hmph. Very well. What did you say his name was? InProgressMessage = 1075402; // Take the packet and return it to the beggar who found my ring. CompletionMessage = 1075403; // What? For me? Let me see . . . these sapphire earrings are for you, it says. Oh, she wants to offer me a job! This is the most wonderful thing that ever happened to me! @@ -75,13 +75,13 @@ namespace Server.Engines.MLQuests.Definitions public class Evan : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Evan"; [Constructible] public Evan() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Evan"; Title = "the Beggar"; Race = Race.Human; BodyValue = 0x190; @@ -119,13 +119,13 @@ namespace Server.Engines.MLQuests.Definitions public class Regina : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Regina"; [Constructible] public Regina() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Regina"; Title = "the Noble"; Race = Race.Human; BodyValue = 0x191; diff --git a/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs b/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs index 20795cecf..28b4fa2e9 100644 --- a/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs +++ b/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs @@ -121,10 +121,11 @@ namespace Server.Engines.MLQuests.Definitions public class Lissbet : BaseEscortable { - public override bool StaticMLQuester { get { return true; } } - public override bool InitialInnocent { get { return true; } } + public override bool StaticMLQuester => true; + public override bool InitialInnocent => true; + public override string DefaultName => "Lissbet"; - public override bool CanShout { get { return true; } } + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -147,7 +148,7 @@ namespace Server.Engines.MLQuests.Definitions Hue = Utility.RandomSkinHue(); Female = true; Body = 401; - Name = "Lissbet"; + Title = "the flower girl"; HairItemID = 0x203D; @@ -183,14 +184,14 @@ namespace Server.Engines.MLQuests.Definitions public class GrandpaCharley : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Grandpa Charley"; + public override bool CanTeach => true; [Constructible] public GrandpaCharley() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Grandpa Charley"; Title = "the farmer"; Body = 400; Hue = Race.RandomSkinHue(); @@ -235,9 +236,9 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Jelrice (Ilshenar)" )] public class Jelrice : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Jelrice"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074221 ); // Greetings!  I have a small task for you good traveler. @@ -247,7 +248,6 @@ namespace Server.Engines.MLQuests.Definitions public Jelrice() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Jelrice"; Title = "the trader"; Race = Race.Human; BodyValue = 0x191; @@ -285,9 +285,9 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Yorus (Ilshenar)" )] public class Yorus : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Yorus"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074218 ); // Hey!  I want to talk to you, now. @@ -297,7 +297,6 @@ namespace Server.Engines.MLQuests.Definitions public Yorus() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Yorus"; Title = "the tinker"; Race = Race.Human; BodyValue = 0x190; diff --git a/Scripts/Engines/MLQuests/Definitions/Malas.cs b/Scripts/Engines/MLQuests/Definitions/Malas.cs index 5e95d1ff8..08c56e840 100644 --- a/Scripts/Engines/MLQuests/Definitions/Malas.cs +++ b/Scripts/Engines/MLQuests/Definitions/Malas.cs @@ -43,10 +43,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Drithen (Umbra)" )] public class Drithen : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Drithen"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074188 ); // Weakling! You are not up to the task I have. @@ -56,7 +56,6 @@ namespace Server.Engines.MLQuests.Definitions public Drithen() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Drithen"; Title = "the Fierce"; Race = Race.Human; BodyValue = 0x190; diff --git a/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs b/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs index 076c30ca0..41fad4b31 100644 --- a/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs +++ b/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs @@ -43,7 +43,7 @@ namespace Server.Engines.MLQuests.Definitions public class YouScratchMyBack : MLQuest { public override Type NextQuest { get { return typeof( FoolingAernya ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public YouScratchMyBack() { @@ -73,7 +73,7 @@ namespace Server.Engines.MLQuests.Definitions public class FoolingAernya : MLQuest { public override Type NextQuest { get { return typeof( NotQuiteThatEasy ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public FoolingAernya() { @@ -94,7 +94,7 @@ namespace Server.Engines.MLQuests.Definitions public class NotQuiteThatEasy : MLQuest { public override Type NextQuest { get { return typeof( ConvinceMe ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public NotQuiteThatEasy() { @@ -127,7 +127,7 @@ namespace Server.Engines.MLQuests.Definitions public class ConvinceMe : MLQuest { public override Type NextQuest { get { return typeof( TuitionReimbursement ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public ConvinceMe() { @@ -158,7 +158,7 @@ namespace Server.Engines.MLQuests.Definitions public class TuitionReimbursement : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public TuitionReimbursement() { @@ -183,13 +183,13 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Aernya (Umbra)" )] public class Aernya : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Aernya"; [Constructible] public Aernya() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Aernya"; Title = "the Mistress of Admissions"; Race = Race.Human; BodyValue = 0x191; @@ -229,13 +229,13 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Gorrow (Luna)" )] public class Gorrow : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Gorrow"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074200, // Thank goodness you are here, there’s no time to lose. + 1074200, // Thank goodness you are here, there�s no time to lose. 1074203 // Hello friend. I realize you are busy but if you would be willing to render me a service I can assure you that you will be judiciously renumerated. ) ); } @@ -244,7 +244,6 @@ namespace Server.Engines.MLQuests.Definitions public Gorrow() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Gorrow"; Title = "the Mayor"; Race = Race.Human; BodyValue = 0x190; @@ -282,10 +281,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Master Gnosos (Bedlam)" )] public class MasterGnosos : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Master Gnosos"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074186 ); // Come here, I have a task. @@ -295,7 +294,6 @@ namespace Server.Engines.MLQuests.Definitions public MasterGnosos() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Master Gnosos"; Title = "the necromancer"; Race = Race.Human; BodyValue = 0x190; diff --git a/Scripts/Engines/MLQuests/Definitions/NewHaven.cs b/Scripts/Engines/MLQuests/Definitions/NewHaven.cs index 6c119b759..98f75182b 100644 --- a/Scripts/Engines/MLQuests/Definitions/NewHaven.cs +++ b/Scripts/Engines/MLQuests/Definitions/NewHaven.cs @@ -9,7 +9,7 @@ namespace Server.Engines.MLQuests.Definitions public class NewHavenEscort : BaseEscort { // New Haven escorts do not count for 'helping a human in need' - public override bool AwardHumanInNeed { get { return false; } } + public override bool AwardHumanInNeed => false; // Escort reward private static readonly BaseReward m_Reward = new ItemReward( "Gold", typeof( Gold ), 500 ); diff --git a/Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs b/Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs index 1e1602ddc..ed2d0a5d7 100644 --- a/Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs +++ b/Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs @@ -714,7 +714,8 @@ namespace Server.Engines.MLQuests.Definitions public class Aelorn : KeeperOfChivalry { - public override bool CanShout { get { return true; } } + public override string DefaultName => "Aelorn"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078133 ); // Hail, friend. Want to live the life of a paladin? @@ -723,7 +724,6 @@ namespace Server.Engines.MLQuests.Definitions [Constructible] public Aelorn() { - Name = "Aelorn"; Title = "the Chivalry Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -777,10 +777,10 @@ namespace Server.Engines.MLQuests.Definitions public class Dimethro : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Dimethro"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078128 ); // You there! Wanna master hand to hand defense? Of course you do! @@ -790,7 +790,6 @@ namespace Server.Engines.MLQuests.Definitions public Dimethro() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Dimethro"; Title = "the Wrestling Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -836,10 +835,10 @@ namespace Server.Engines.MLQuests.Definitions public class Churchill : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Churchill"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078141 ); // Don't listen to Jockles. Real warriors wield mace weapons! @@ -849,7 +848,6 @@ namespace Server.Engines.MLQuests.Definitions public Churchill() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Churchill"; Title = "the Mace Fighting Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -914,7 +912,8 @@ namespace Server.Engines.MLQuests.Definitions public class Robyn : Bowyer { - public override bool CanShout { get { return true; } } + public override string DefaultName => "Robyn"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078202 ); // Archery requires a steady aim and dexterous fingers. @@ -923,7 +922,6 @@ namespace Server.Engines.MLQuests.Definitions [Constructible] public Robyn() { - Name = "Robyn"; Title = "the Archery Instructor"; BodyValue = 0x191; Hue = 0x83EA; @@ -996,10 +994,10 @@ namespace Server.Engines.MLQuests.Definitions public class Recaro : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Recaro"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078187 ); // The art of fencing requires a dexterous hand, a quick wit and fleet feet. @@ -1009,7 +1007,6 @@ namespace Server.Engines.MLQuests.Definitions public Recaro() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Recaro"; Title = "the Fencer Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -1076,10 +1073,10 @@ namespace Server.Engines.MLQuests.Definitions public class AldenArmstrong : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Alden Armstrong"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078136 ); // There is an art to slaying your enemies swiftly. It's called tactics, and I can teach it to you. @@ -1089,7 +1086,6 @@ namespace Server.Engines.MLQuests.Definitions public AldenArmstrong() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Alden Armstrong"; Title = "the Tactics Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -1137,10 +1133,10 @@ namespace Server.Engines.MLQuests.Definitions public class Jockles : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Jockles"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078135 ); // Talk to me to learn the way of the blade. @@ -1150,7 +1146,6 @@ namespace Server.Engines.MLQuests.Definitions public Jockles() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Jockles"; Title = "the Swordsmanship Instructor"; BodyValue = 0x190; Hue = 0x83FA; @@ -1198,10 +1193,10 @@ namespace Server.Engines.MLQuests.Definitions public class TylAriadne : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Tyl Ariadne"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078140 ); // Want to learn how to parry blows? @@ -1211,7 +1206,6 @@ namespace Server.Engines.MLQuests.Definitions public TylAriadne() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Tyl Ariadne"; Title = "the Parrying Instructor"; BodyValue = 0x190; Hue = 0x8374; @@ -1279,10 +1273,10 @@ namespace Server.Engines.MLQuests.Definitions public class Alefian : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Alefian"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078130 ); // A mage should learn how to resist spells. @@ -1292,7 +1286,6 @@ namespace Server.Engines.MLQuests.Definitions public Alefian() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Alefian"; Title = "the Resisting Spells Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -1335,10 +1328,10 @@ namespace Server.Engines.MLQuests.Definitions public class Gustar : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Gustar"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078126 ); // Meditation allows a mage to replenish mana quickly. I can teach you. @@ -1348,7 +1341,6 @@ namespace Server.Engines.MLQuests.Definitions public Gustar() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Gustar"; Title = "the Meditation Instructor"; BodyValue = 0x190; Hue = 0x83F5; @@ -1419,10 +1411,10 @@ namespace Server.Engines.MLQuests.Definitions public class Jillian : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Jillian"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078129 ); // I can teach you how to scribe magic scrolls. @@ -1432,7 +1424,6 @@ namespace Server.Engines.MLQuests.Definitions public Jillian() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Jillian"; Title = "the Inscription Instructor"; BodyValue = 0x191; Female = true; @@ -1476,10 +1467,10 @@ namespace Server.Engines.MLQuests.Definitions public class Kaelynna : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Kaelynna"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078125 ); // Want to unlock the secrets of magery? @@ -1489,7 +1480,6 @@ namespace Server.Engines.MLQuests.Definitions public Kaelynna() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Kaelynna"; Title = "the Magery Instructor"; BodyValue = 0x191; Female = true; @@ -1533,10 +1523,10 @@ namespace Server.Engines.MLQuests.Definitions public class Mithneral : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Mithneral"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078127 ); // Want to maximize your spell damage? I have a scholarly task for you! @@ -1546,7 +1536,6 @@ namespace Server.Engines.MLQuests.Definitions public Mithneral() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Mithneral"; Title = "the Evaluating Intelligence Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -1594,7 +1583,8 @@ namespace Server.Engines.MLQuests.Definitions public class AmeliaYoungstone : Tinker { - public override bool CanShout { get { return true; } } + public override string DefaultName => "Amelia Youngstone"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078123 ); // Tinkering is very useful for a blacksmith. You can make your own tools. @@ -1603,7 +1593,6 @@ namespace Server.Engines.MLQuests.Definitions [Constructible] public AmeliaYoungstone() { - Name = "Amelia Youngstone"; Title = "the Tinkering Instructor"; BodyValue = 0x191; Female = true; @@ -1653,10 +1642,10 @@ namespace Server.Engines.MLQuests.Definitions public class AndreasVesalius : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Andreas Vesalius"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078138 ); // Learning of the body will allow you to excel in combat. @@ -1666,7 +1655,6 @@ namespace Server.Engines.MLQuests.Definitions public AndreasVesalius() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Andreas Vesalius"; Title = "the Anatomy Instructor"; BodyValue = 0x190; Hue = 0x83EC; @@ -1713,10 +1701,10 @@ namespace Server.Engines.MLQuests.Definitions public class Avicenna : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Avicenna"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078137 ); // A warrior needs to learn how to apply bandages to wounds. @@ -1726,7 +1714,6 @@ namespace Server.Engines.MLQuests.Definitions public Avicenna() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Avicenna"; Title = "the Healing Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -1770,10 +1757,10 @@ namespace Server.Engines.MLQuests.Definitions public class SarsmeaSmythe : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Sarsmea Smythe"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078139 ); // Know yourself, and you will become a true warrior. @@ -1783,7 +1770,6 @@ namespace Server.Engines.MLQuests.Definitions public SarsmeaSmythe() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Sarsmea Smythe"; Title = "the Focus Instructor"; BodyValue = 0x191; Female = true; @@ -1835,7 +1821,8 @@ namespace Server.Engines.MLQuests.Definitions private List m_SBInfos = new List(); protected override List SBInfos { get { return m_SBInfos; } } - public override bool CanShout { get { return true; } } + public override string DefaultName => "Ryuichi"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078155 ); // I can teach you Ninjitsu. The Art of Stealth. @@ -1845,7 +1832,6 @@ namespace Server.Engines.MLQuests.Definitions public Ryuichi() : base( "the Ninjitsu Instructor" ) { - Name = "Ryuichi"; Hue = 0x8403; SetSkill( SkillName.Hiding, 120.0 ); @@ -1903,10 +1889,10 @@ namespace Server.Engines.MLQuests.Definitions public class Chiyo : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Chiyo"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078165 ); // To be undetected means you cannot be harmed. @@ -1916,7 +1902,6 @@ namespace Server.Engines.MLQuests.Definitions public Chiyo() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Chiyo"; Title = "the Hiding Instructor"; BodyValue = 0xF7; @@ -1952,10 +1937,10 @@ namespace Server.Engines.MLQuests.Definitions public class Jun : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Jun"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078175 ); // Walk Silently. Remain unseen. I can teach you. @@ -1965,7 +1950,6 @@ namespace Server.Engines.MLQuests.Definitions public Jun() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Jun"; Title = "the Stealth Instructor"; BodyValue = 0x190; Hue = 0x8403; @@ -2012,10 +1996,10 @@ namespace Server.Engines.MLQuests.Definitions public class Walker : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Walker"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -2029,7 +2013,6 @@ namespace Server.Engines.MLQuests.Definitions public Walker() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Walker"; Title = "the Tracking Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -2080,7 +2063,8 @@ namespace Server.Engines.MLQuests.Definitions private List m_SBInfos = new List(); protected override List SBInfos { get { return m_SBInfos; } } - public override bool CanShout { get { return true; } } + public override string DefaultName => "Hamato"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078134 ); // Seek me to learn the way of the samurai. @@ -2090,7 +2074,6 @@ namespace Server.Engines.MLQuests.Definitions public Hamato() : base( "the Bushido Instructor" ) { - Name = "Hamato"; Hue = 0x8403; SetSkill( SkillName.Anatomy, 120.0 ); @@ -2149,7 +2132,8 @@ namespace Server.Engines.MLQuests.Definitions public class Mulcivikh : Mage { - public override bool CanShout { get { return true; } } + public override string DefaultName => "Mulcivikh"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078131 ); // Allured by dark magic, aren't you? @@ -2158,7 +2142,6 @@ namespace Server.Engines.MLQuests.Definitions [Constructible] public Mulcivikh() { - Name = "Mulcivikh"; Title = "the Necromancy Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -2226,7 +2209,8 @@ namespace Server.Engines.MLQuests.Definitions public class Morganna : Mage { - public override bool CanShout { get { return true; } } + public override string DefaultName => "Morganna"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078132 ); // Want to learn how to channel the supernatural? @@ -2235,7 +2219,6 @@ namespace Server.Engines.MLQuests.Definitions [Constructible] public Morganna() { - Name = "Morganna"; Title = "the Spirit Speak Instructor"; BodyValue = 0x191; Female = true; @@ -2283,10 +2266,10 @@ namespace Server.Engines.MLQuests.Definitions public class JacobWaltz : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Jacob Waltz"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078124 ); // You there! I can use some help mining these rocks! @@ -2296,7 +2279,6 @@ namespace Server.Engines.MLQuests.Definitions public JacobWaltz() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Jacob Waltz"; Title = "the Miner Instructor"; BodyValue = 0x190; Hue = 0x83EA; @@ -2346,7 +2328,8 @@ namespace Server.Engines.MLQuests.Definitions public class GeorgeHephaestus : Blacksmith { - public override bool CanShout { get { return true; } } + public override string DefaultName => "George Hephaestus"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1078122 ); // Wanna learn how to make powerful weapons and armor? Talk to me. @@ -2355,7 +2338,6 @@ namespace Server.Engines.MLQuests.Definitions [Constructible] public GeorgeHephaestus() { - Name = "George Hephaestus"; Title = "the Blacksmith Instructor"; BodyValue = 0x190; Hue = 0x83EA; diff --git a/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs b/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs index 2d4d82b5a..efa9cacae 100644 --- a/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs +++ b/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs @@ -145,7 +145,7 @@ namespace Server.Engines.MLQuests.Definitions Title = 1075530; // More Ore Please Description = 1075529; // Have a pickaxe? My supplier is late and I need some iron ore so I can complete a bulk order for another merchant. If you can get me some soon I'll pay you double what it's worth on the market. Just find a cave or mountainside and try to use your pickaxe there, maybe you'll strike a good vein! 5 large pieces should do it. RefusalMessage = 1075531; // Not feeling strong enough today? Its alright, I didn't need a bucket of rocks anyway. - InProgressMessage = 1075532; // Hmmm… we need some more Ore. Try finding a mountain or cave, and give it a whack. + InProgressMessage = 1075532; // Hmmm� we need some more Ore. Try finding a mountain or cave, and give it a whack. CompletionMessage = 1075533; // I see you found a good vien! Great! This will help get this order out on time. Good work! Objectives.Add( new InternalObjective() ); @@ -331,15 +331,15 @@ namespace Server.Engines.MLQuests.Definitions public class Andric : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Andric"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074205, // Oh great adventurer, would you please assist a weak soul in need of aid? - 1074213 // Hey buddy.  Looking for work? + 1074213 // Hey buddy.� Looking for work? ) ); } @@ -347,7 +347,6 @@ namespace Server.Engines.MLQuests.Definitions public Andric() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Andric"; Title = "the archer trainer"; Race = Race.Human; BodyValue = 0x190; @@ -405,13 +404,13 @@ namespace Server.Engines.MLQuests.Definitions public class Kashiel : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override string DefaultName => "Kashiel"; + public override bool IsInvulnerable => true; [Constructible] public Kashiel() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Kashiel"; Title = "the archer"; Race = Race.Human; BodyValue = 0x191; @@ -467,14 +466,14 @@ namespace Server.Engines.MLQuests.Definitions public class Asandos : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Asandos"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074205, // Oh great adventurer, would you please assist a weak soul in need of aid? - 1074213 // Hey buddy.  Looking for work? + 1074213 // Hey buddy.� Looking for work? ) ); } @@ -482,7 +481,6 @@ namespace Server.Engines.MLQuests.Definitions public Asandos() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Asandos"; Title = "the chef"; Race = Race.Human; BodyValue = 0x190; @@ -523,14 +521,14 @@ namespace Server.Engines.MLQuests.Definitions //[QuesterName( "Clarisse" )] // On OSI the gumps refer to her as this, different from actual name public class Clairesse : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Clairesse"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074205, // Oh great adventurer, would you please assist a weak soul in need of aid? - 1074213 // Hey buddy.  Looking for work? + 1074213 // Hey buddy.� Looking for work? ) ); } @@ -538,7 +536,6 @@ namespace Server.Engines.MLQuests.Definitions public Clairesse() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Clairesse"; Title = "the servant"; Race = Race.Human; BodyValue = 0x191; @@ -575,15 +572,15 @@ namespace Server.Engines.MLQuests.Definitions public class Gervis : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Gervis"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074205, // Oh great adventurer, would you please assist a weak soul in need of aid? - 1074213, // Hey buddy.  Looking for work? + 1074213, // Hey buddy.� Looking for work? 1074211 // I could use some help. ) ); } @@ -592,7 +589,6 @@ namespace Server.Engines.MLQuests.Definitions public Gervis() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Gervis"; Title = "the blacksmith trainer"; Race = Race.Human; BodyValue = 0x190; @@ -639,9 +635,9 @@ namespace Server.Engines.MLQuests.Definitions public class Mugg : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Mugg"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074211 ); // I could use some help. @@ -651,7 +647,6 @@ namespace Server.Engines.MLQuests.Definitions public Mugg() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Mugg"; Title = "the miner"; Race = Race.Human; BodyValue = 0x190; @@ -692,14 +687,14 @@ namespace Server.Engines.MLQuests.Definitions public class Lowel : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Lowel"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074205, // Oh great adventurer, would you please assist a weak soul in need of aid? - 1074213 // Hey buddy.  Looking for work? + 1074213 // Hey buddy.� Looking for work? ) ); } @@ -707,7 +702,6 @@ namespace Server.Engines.MLQuests.Definitions public Lowel() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lowel"; Title = "the carpenter"; Race = Race.Human; BodyValue = 0x190; @@ -746,14 +740,14 @@ namespace Server.Engines.MLQuests.Definitions public class Lyle : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Lyle"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074205, // Oh great adventurer, would you please assist a weak soul in need of aid? - 1074213 // Hey buddy.  Looking for work? + 1074213 // Hey buddy.� Looking for work? ) ); } @@ -761,7 +755,6 @@ namespace Server.Engines.MLQuests.Definitions public Lyle() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lyle"; Title = "the mage"; Race = Race.Human; BodyValue = 0x190; @@ -798,13 +791,13 @@ namespace Server.Engines.MLQuests.Definitions public class Nibbet : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override string DefaultName => "Nibbet"; + public override bool IsInvulnerable => true; [Constructible] public Nibbet() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Nibbet"; Title = "the tinker"; Race = Race.Human; BodyValue = 0x190; @@ -843,14 +836,14 @@ namespace Server.Engines.MLQuests.Definitions public class Norton : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Norton"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074205, // Oh great adventurer, would you please assist a weak soul in need of aid? - 1074213, // Hey buddy.  Looking for work? + 1074213, // Hey buddy.� Looking for work? 1074211 // I could use some help. ) ); } @@ -859,7 +852,6 @@ namespace Server.Engines.MLQuests.Definitions public Norton() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Norton"; Title = "the fisher"; Race = Race.Human; BodyValue = 0x190; @@ -897,14 +889,14 @@ namespace Server.Engines.MLQuests.Definitions public class Sadrah : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Sadrah"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074205, // Oh great adventurer, would you please assist a weak soul in need of aid? - 1074213, // Hey buddy.  Looking for work? + 1074213, // Hey buddy.� Looking for work? 1074211 // I could use some help. ) ); } @@ -913,7 +905,6 @@ namespace Server.Engines.MLQuests.Definitions public Sadrah() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Sadrah"; Title = "the courier"; Race = Race.Human; BodyValue = 0x191; @@ -953,13 +944,13 @@ namespace Server.Engines.MLQuests.Definitions public class Hargrove : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override string DefaultName => "Hargrove"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074213, // Hey buddy.  Looking for work? + 1074213, // Hey buddy.� Looking for work? 1074211 // I could use some help. ) ); } @@ -968,7 +959,6 @@ namespace Server.Engines.MLQuests.Definitions public Hargrove() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Hargrove"; Title = "the Lumberjack"; Race = Race.Human; BodyValue = 0x190; diff --git a/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs b/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs index 261a0a4df..bf3babc24 100644 --- a/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs +++ b/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs @@ -365,7 +365,7 @@ namespace Server.Engines.MLQuests.Definitions { Activated = true; Title = 1073085; // Arch Enemies - Description = 1073575; // Vermin! They get into everything! I told the boy to leave out some poisoned cheese -- and they shot him. What else can I do? Unless…these ratmen are skilled with a bow, but I'd lay a wager you're better, eh? Could you skin a few of the wretches for me? + Description = 1073575; // Vermin! They get into everything! I told the boy to leave out some poisoned cheese -- and they shot him. What else can I do? Unless�these ratmen are skilled with a bow, but I'd lay a wager you're better, eh? Could you skin a few of the wretches for me? RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073595; // I don't see 10 tails from Ratman Archers on your belt -- and until I do, no reward for you. @@ -413,7 +413,7 @@ namespace Server.Engines.MLQuests.Definitions public class LeaderOfThePack : MLQuest { public override Type NextQuest { get { return typeof( SayonaraSzavetra ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public LeaderOfThePack() { @@ -432,7 +432,7 @@ namespace Server.Engines.MLQuests.Definitions public class SayonaraSzavetra : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public SayonaraSzavetra() { @@ -541,7 +541,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheBrainsOfTheOperation : MLQuest { public override Type NextQuest { get { return typeof( TheBrawn ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public TheBrainsOfTheOperation() { @@ -560,7 +560,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheBrawn : MLQuest { public override Type NextQuest { get { return typeof( TheBiggerTheyAre ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public TheBrawn() { @@ -578,7 +578,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheBiggerTheyAre : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public TheBiggerTheyAre() { @@ -635,7 +635,7 @@ namespace Server.Engines.MLQuests.Definitions { Activated = true; Title = 1073082; // Common Brigands - Description = 1073572; // Thank goodness, a hero like you has arrived! Brigands have descended upon this area like locusts, stealing and looting where ever they go. We need someone to put these vile curs where they belong -- in their graves. Are you up to the task? + Description = 1073572; // Thank goodness, a hero like you has arrived! Brigands have descended upon this area like locusts, stealing and looting where ever they go. We need someone to put these vile curs where they belong -- in their graves. Are you up to the task? RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073592; // The Brigands still plague us. Have you killed 20 of their number?
@@ -652,10 +652,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Beotham (Sanctuary)" )] public class Beotham : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Beotham"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -668,7 +668,6 @@ namespace Server.Engines.MLQuests.Definitions public Beotham() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Beotham"; Title = "the bowcrafter"; Race = Race.Elf; BodyValue = 0x25D; @@ -717,20 +716,19 @@ namespace Server.Engines.MLQuests.Definitions { // TODO: Add quests: Spring Cleaning - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Danoel"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { - MLQuestSystem.Tell( this, pm, 1074197 ); // Pardon me, but if you could spare some time I’d greatly appreciate it. + MLQuestSystem.Tell( this, pm, 1074197 ); // Pardon me, but if you could spare some time I�d greatly appreciate it. } [Constructible] public Danoel() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Danoel"; Title = "the metal weaver"; Race = Race.Elf; BodyValue = 0x25D; @@ -774,10 +772,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Tallinin (Sanctuary)" )] public class Tallinin : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Tallinin"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -790,7 +788,6 @@ namespace Server.Engines.MLQuests.Definitions public Tallinin() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Tallinin"; Title = "the cloth weaver"; Race = Race.Elf; BodyValue = 0x25E; @@ -831,15 +828,15 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Tiana (Sanctuary)" )] public class Tiana : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Tiana"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( 1074214, // Knave! Come here right now! - 1074218 // Hey!  I want to talk to you, now. + 1074218 // Hey!� I want to talk to you, now. ) ); } @@ -847,7 +844,6 @@ namespace Server.Engines.MLQuests.Definitions public Tiana() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Tiana"; Title = "the guard"; Race = Race.Elf; BodyValue = 0x25E; @@ -901,10 +897,10 @@ namespace Server.Engines.MLQuests.Definitions { // TODO: Add quest Dreadhorn - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Lorekeeper Oolua"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074187 ); // Want a job? @@ -914,7 +910,6 @@ namespace Server.Engines.MLQuests.Definitions public LorekeeperOolua() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lorekeeper Oolua"; Title = "the keeper of tradition"; Race = Race.Elf; BodyValue = 0x25E; @@ -957,15 +952,15 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Rollarn (Sanctuary)" )] public class LorekeeperRollarn : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Lorekeeper Rollarn"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074196, // Excuse me! I’m sorry to interrupt but I urgently need some assistance. - 1074197 // Pardon me, but if you could spare some time I’d greatly appreciate it. + 1074196, // Excuse me! I�m sorry to interrupt but I urgently need some assistance. + 1074197 // Pardon me, but if you could spare some time I�d greatly appreciate it. ) ); } @@ -973,7 +968,6 @@ namespace Server.Engines.MLQuests.Definitions public LorekeeperRollarn() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lorekeeper Rollarn"; Title = "the keeper of tradition"; Race = Race.Elf; BodyValue = 0x25D; @@ -1021,10 +1015,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Dallid (Sanctuary)" )] public class Dallid : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Dallid"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -1037,7 +1031,6 @@ namespace Server.Engines.MLQuests.Definitions public Dallid() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Dallid"; Title = "the cook"; Race = Race.Elf; BodyValue = 0x25D; @@ -1080,10 +1073,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Canir (Sanctuary)" )] public class Canir : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Canir"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -1096,7 +1089,6 @@ namespace Server.Engines.MLQuests.Definitions public Canir() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Canir"; Title = "the thaumaturgist"; Race = Race.Elf; BodyValue = 0x25E; @@ -1137,13 +1129,13 @@ namespace Server.Engines.MLQuests.Definitions public class Yellienir : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override string DefaultName => "Yellienir"; + public override bool IsInvulnerable => true; [Constructible] public Yellienir() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Yellienir"; Title = "the bark weaver"; Race = Race.Elf; BodyValue = 0x25E; @@ -1183,15 +1175,15 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Elder Onallan (Sanctuary)" )] public class ElderOnallan : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Elder Onallan"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( - 1074217, // I want to make you an offer you’d be a fool to  refuse. - 1074218 // Hey!  I want to talk to you, now. + 1074217, // I want to make you an offer you�d be a fool to �refuse. + 1074218 // Hey!� I want to talk to you, now. ) ); } @@ -1199,7 +1191,6 @@ namespace Server.Engines.MLQuests.Definitions public ElderOnallan() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Elder Onallan"; Title = "the wise"; Race = Race.Elf; BodyValue = 0x25D; diff --git a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs index a67ca203e..161ea7778 100644 --- a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs +++ b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs @@ -75,7 +75,7 @@ namespace Server.Engines.MLQuests.Definitions public class NeedsOfTheManyHeartwood1 : MLQuest { public override Type NextQuest { get { return typeof( NeedsOfTheManyHeartwood2 ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public NeedsOfTheManyHeartwood1() { @@ -95,7 +95,7 @@ namespace Server.Engines.MLQuests.Definitions public class NeedsOfTheManyHeartwood2 : MLQuest { public override Type NextQuest { get { return typeof( MakingAContributionHeartwood ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public NeedsOfTheManyHeartwood2() { @@ -115,7 +115,7 @@ namespace Server.Engines.MLQuests.Definitions public class MakingAContributionHeartwood : MLQuest { public override Type NextQuest { get { return typeof( UnnaturalCreations ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public MakingAContributionHeartwood() { @@ -136,7 +136,7 @@ namespace Server.Engines.MLQuests.Definitions public class UnnaturalCreations : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public UnnaturalCreations() { @@ -196,7 +196,7 @@ namespace Server.Engines.MLQuests.Definitions public class NeedsOfTheManySanctuary : MLQuest { public override Type NextQuest { get { return typeof( MakingAContributionSanctuary ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public NeedsOfTheManySanctuary() { @@ -216,7 +216,7 @@ namespace Server.Engines.MLQuests.Definitions public class MakingAContributionSanctuary : MLQuest { public override Type NextQuest { get { return typeof( SuppliesForSanctuary ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public MakingAContributionSanctuary() { @@ -236,7 +236,7 @@ namespace Server.Engines.MLQuests.Definitions public class SuppliesForSanctuary : MLQuest { public override Type NextQuest { get { return typeof( TheHumanBlight ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public SuppliesForSanctuary() { @@ -257,7 +257,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheHumanBlight : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public TheHumanBlight() { @@ -317,7 +317,7 @@ namespace Server.Engines.MLQuests.Definitions public class TokenOfFriendship : MLQuest { public override Type NextQuest { get { return typeof( Alliance ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public TokenOfFriendship() { @@ -336,7 +336,7 @@ namespace Server.Engines.MLQuests.Definitions public class Alliance : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public Alliance() { @@ -397,7 +397,7 @@ namespace Server.Engines.MLQuests.Definitions public class CrackingTheWhipI : MLQuest { public override Type NextQuest { get { return typeof( CrackingTheWhipII ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public CrackingTheWhipI() { @@ -417,7 +417,7 @@ namespace Server.Engines.MLQuests.Definitions // TODO: Verify public class CrackingTheWhipII : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public CrackingTheWhipII() { @@ -448,10 +448,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Aeluva (The Heartwood)" )] public class Aeluva : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Aeluva"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { /* @@ -465,7 +465,6 @@ namespace Server.Engines.MLQuests.Definitions public Aeluva() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2.0 ) { - Name = "Aeluva"; Title = "the arcanist"; Race = Race.Elf; Female = true; @@ -507,10 +506,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Koole (Sanctuary)" )] public class Koole : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Koole"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -523,7 +522,6 @@ namespace Server.Engines.MLQuests.Definitions public Koole() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2.0 ) { - Name = "Koole"; Title = "the arcanist"; Race = Race.Elf; Body = 605; @@ -573,10 +571,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Synaeva (The Heartwood)" )] public class Synaeva : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Synaeva"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, 1074223 ); // Have you done it yet?  Oh, I haven’t told you, have I? @@ -586,7 +584,6 @@ namespace Server.Engines.MLQuests.Definitions public Synaeva() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2.0 ) { - Name = "Synaeva"; Title = "the arcanist"; Race = Race.Elf; Female = true; @@ -633,10 +630,10 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Elder Brae (Sanctuary)" )] public class ElderBrae : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Elder Brae"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { MLQuestSystem.Tell( this, pm, Utility.RandomList( @@ -649,7 +646,6 @@ namespace Server.Engines.MLQuests.Definitions public ElderBrae() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2.0 ) { - Name = "Elder Brae"; Title = "the wise"; Race = Race.Elf; Female = true; diff --git a/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs b/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs index 4b3b9d086..9418142c4 100644 --- a/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs +++ b/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs @@ -42,7 +42,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheGoldenHorn : MLQuest { public override Type NextQuest { get { return typeof( Bullish ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public TheGoldenHorn() { @@ -62,7 +62,7 @@ namespace Server.Engines.MLQuests.Definitions public class Bullish : MLQuest { public override Type NextQuest { get { return typeof( LostCivilization ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public Bullish() { @@ -81,7 +81,7 @@ namespace Server.Engines.MLQuests.Definitions public class LostCivilization : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public LostCivilization() { @@ -105,20 +105,19 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Broolol (The Heartwood)" )] public class LorekeeperBroolol : BaseCreature { - public override bool IsInvulnerable { get { return true; } } - public override bool CanTeach { get { return true; } } - - public override bool CanShout { get { return true; } } + public override bool IsInvulnerable => true; + public override bool CanTeach => true; + public override string DefaultName => "Lorekeeper Broolol"; + public override bool CanShout => true; public override void Shout( PlayerMobile pm ) { - MLQuestSystem.Tell( this, pm, 1074200 ); // Thank goodness you are here, there’s no time to lose. + MLQuestSystem.Tell( this, pm, 1074200 ); // Thank goodness you are here, there�s no time to lose. } [Constructible] public LorekeeperBroolol() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Lorekeeper Broolol"; Title = "the keeper of tradition"; Race = Race.Elf; BodyValue = 0x25E; diff --git a/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs b/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs index fc754ab35..afa0a013e 100644 --- a/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs +++ b/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs @@ -20,10 +20,10 @@ namespace Server.Engines.MLQuests.Definitions { Activated = true; Title = 1075355; // Unfading Memories - Description = 1075356; // Aargh! It’s just not right! It doesn’t capture the unique color of her hair at all! If only I had some Prismatic Amber. That would be perfect. They used to mine it in Malas, but alas, those veins ran dry some time ago. I hear it may have been found in the Prism of Light. Oh, if only there were a bold adventurer within earshot who would go to the Prism of Light and retrieve some for me! + Description = 1075356; // Aargh! It�s just not right! It doesn�t capture the unique color of her hair at all! If only I had some Prismatic Amber. That would be perfect. They used to mine it in Malas, but alas, those veins ran dry some time ago. I hear it may have been found in the Prism of Light. Oh, if only there were a bold adventurer within earshot who would go to the Prism of Light and retrieve some for me! RefusalMessage = 1075358; // Is there no one who can help a humble artist pursue his Muse? InProgressMessage = 1075359; // You can find Prismatic Amber in the Prism of Light, located just north of the city of Nujel'm. - CompletionMessage = 1075360; // I knew it! See, it’s just the color I needed! Look how it brings out the highlights of her wheaten tresses! + CompletionMessage = 1075360; // I knew it! See, it�s just the color I needed! Look how it brings out the highlights of her wheaten tresses! CompletionNotice = CompletionNoticeShort; Objectives.Add( new CollectObjective( 1, typeof( PrismaticAmber ), "Prismatic Amber" ) ); @@ -43,7 +43,7 @@ namespace Server.Engines.MLQuests.Definitions public class UnfadingMemoriesPartTwo : MLQuest { public override Type NextQuest { get { return typeof( UnfadingMemoriesPartThree ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public UnfadingMemoriesPartTwo() { @@ -52,28 +52,28 @@ namespace Server.Engines.MLQuests.Definitions Description = 1075368; // Finished! With the pigment I was able to create from the Prismatic Amber you brought me, I was able to complete my humble work. I should explain. Once, I loved a noble lady of gentleness and refinement, who possessed such beauty that I have found myself unable to love another to this day. But it was from afar that I admired her, for it is not for one so lowly as I to pay court to the likes of her. You have heard of the fair Thalia, Lady of Nujel'm? No? Well, she was my Muse, my inspiration, and when I heard she was to be married, I lost whatever pitiful talent I possessed. I felt I must compose a portrait of her, my masterpiece, or I would never be able to paint again. You, my friend, have helped me complete my work. Now I ask another favor of you. Will you take it to her as a wedding gift? She will probably reject it, but I must make the offer. RefusalMessage = 1075370; // Alright then, you have already helped me more than I deserved. I shall find someone else to undertake this task. InProgressMessage = 1075371; // The wedding is taking place in the palace in Nujel'm. You will likely find her there. - CompletionMessage = 1075372; // I’m sorry, I’m getting ready to be married. I don’t have time to . . . what’s that you say? + CompletionMessage = 1075372; // I�m sorry, I�m getting ready to be married. I don�t have time to . . . what�s that you say? CompletionNotice = CompletionNoticeShort; Objectives.Add( new DeliverObjective( typeof( PortraitOfTheBride ), 1, "Portrait of the Bride", typeof( Thalia ) ) ); - Rewards.Add( new DummyReward( 1075369 ) ); // The Artist’s gratitude. + Rewards.Add( new DummyReward( 1075369 ) ); // The Artist�s gratitude. } } public class UnfadingMemoriesPartThree : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public UnfadingMemoriesPartThree() { Activated = true; OneTimeOnly = true; Title = 1075373; // Unfading Memories - Description = 1075374; // Emilio painted this? It is absolutely wonderful! I used to love looking at his paintings, but I don’t remember him creating anything like this before. Would you be so kind as to carry a letter to him? Fate may have it that I am to marry another, yet I am compelled to reveal to him that his love was not entirely unrequited. + Description = 1075374; // Emilio painted this? It is absolutely wonderful! I used to love looking at his paintings, but I don�t remember him creating anything like this before. Would you be so kind as to carry a letter to him? Fate may have it that I am to marry another, yet I am compelled to reveal to him that his love was not entirely unrequited. RefusalMessage = 1075376; // Very well, then. If you will excuse me, I need to get ready. - InProgressMessage = 1075377; // Take the letter back to the Artist’s Guild in Britain, if you would do me this kindness. - CompletionMessage = 1075378; // She said what? She thinks what of me? I . . . I can’t believe it! All this time, I never knew how she truly felt. Thank you, my friend. I believe now I will be able to paint once again. Here, take this bleach. I was going to use it to destroy all of my works. Perhaps you can find a better use for it now. + InProgressMessage = 1075377; // Take the letter back to the Artist�s Guild in Britain, if you would do me this kindness. + CompletionMessage = 1075378; // She said what? She thinks what of me? I . . . I can�t believe it! All this time, I never knew how she truly felt. Thank you, my friend. I believe now I will be able to paint once again. Here, take this bleach. I was going to use it to destroy all of my works. Perhaps you can find a better use for it now. CompletionNotice = CompletionNoticeShort; Objectives.Add( new DeliverObjective( typeof( BridesLetter ), 1, "Bride's Letter", typeof( Emilio ) ) ); @@ -97,13 +97,13 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Emilio (Britain)" )] // OSI's description is "Artist", not very helpful public class Emilio : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override string DefaultName => "Emilio"; + public override bool IsInvulnerable => true; [Constructible] public Emilio() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Emilio"; Title = "the Tortured Artist"; Race = Race.Human; BodyValue = 0x190; @@ -145,13 +145,13 @@ namespace Server.Engines.MLQuests.Definitions [QuesterName( "Thalia (Nujel'm)" )] // OSI's description is "Bride", not very helpful public class Thalia : BaseCreature { - public override bool IsInvulnerable { get { return true; } } + public override string DefaultName => "Thalia"; + public override bool IsInvulnerable => true; [Constructible] public Thalia() : base( AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2 ) { - Name = "Thalia"; Title = "the Bride"; Race = Race.Human; BodyValue = 0x191; diff --git a/Scripts/Engines/MLQuests/Definitions/WarriorsOfTheGemKeeper.cs b/Scripts/Engines/MLQuests/Definitions/WarriorsOfTheGemKeeper.cs index b059fa0e7..d1f77a751 100644 --- a/Scripts/Engines/MLQuests/Definitions/WarriorsOfTheGemKeeper.cs +++ b/Scripts/Engines/MLQuests/Definitions/WarriorsOfTheGemKeeper.cs @@ -32,7 +32,7 @@ namespace Server.Engines.MLQuests.Definitions public class CloseEnough : MLQuest { public override Type NextQuest { get { return typeof( TakingTheBullByTheHorns ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public CloseEnough() { @@ -52,7 +52,7 @@ namespace Server.Engines.MLQuests.Definitions public class TakingTheBullByTheHorns : MLQuest { public override Type NextQuest { get { return typeof( EmissaryToTheMinotaur ); } } - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public TakingTheBullByTheHorns() { @@ -71,7 +71,7 @@ namespace Server.Engines.MLQuests.Definitions public class EmissaryToTheMinotaur : MLQuest { - public override bool IsChainTriggered { get { return true; } } + public override bool IsChainTriggered => true; public EmissaryToTheMinotaur() { diff --git a/Scripts/Engines/MLQuests/Items/APersonalLetterAddressedToAhie.cs b/Scripts/Engines/MLQuests/Items/APersonalLetterAddressedToAhie.cs index f5d3a9616..cb09af25d 100644 --- a/Scripts/Engines/MLQuests/Items/APersonalLetterAddressedToAhie.cs +++ b/Scripts/Engines/MLQuests/Items/APersonalLetterAddressedToAhie.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1073128; } } // A personal letter addressed to: Ahie - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/AlchemistsBandage.cs b/Scripts/Engines/MLQuests/Items/AlchemistsBandage.cs index 6170216a3..e96a8c053 100644 --- a/Scripts/Engines/MLQuests/Items/AlchemistsBandage.cs +++ b/Scripts/Engines/MLQuests/Items/AlchemistsBandage.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1075452; } } // Alchemist's Bandage - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/BasinOfCrystalClearWater.cs b/Scripts/Engines/MLQuests/Items/BasinOfCrystalClearWater.cs index 3acbfa9a7..2bf7e0c77 100644 --- a/Scripts/Engines/MLQuests/Items/BasinOfCrystalClearWater.cs +++ b/Scripts/Engines/MLQuests/Items/BasinOfCrystalClearWater.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1075303; } } // Basin of Crystal-Clear Water - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/BridesLetter.cs b/Scripts/Engines/MLQuests/Items/BridesLetter.cs index 390556acb..5c4424fe9 100644 --- a/Scripts/Engines/MLQuests/Items/BridesLetter.cs +++ b/Scripts/Engines/MLQuests/Items/BridesLetter.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1075301; } } // Bride's Letter - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/CompletedTuitionReimbursementForm.cs b/Scripts/Engines/MLQuests/Items/CompletedTuitionReimbursementForm.cs index 65189b2bf..582bc2489 100644 --- a/Scripts/Engines/MLQuests/Items/CompletedTuitionReimbursementForm.cs +++ b/Scripts/Engines/MLQuests/Items/CompletedTuitionReimbursementForm.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1074625; } } // Completed Tuition Reimbursement Form - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/CrateForSledge.cs b/Scripts/Engines/MLQuests/Items/CrateForSledge.cs index 850e85190..d23a2e0b7 100644 --- a/Scripts/Engines/MLQuests/Items/CrateForSledge.cs +++ b/Scripts/Engines/MLQuests/Items/CrateForSledge.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1074520; } } // Crate for Sledge - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/DreadSpiderSilk.cs b/Scripts/Engines/MLQuests/Items/DreadSpiderSilk.cs index d52357d87..372fa2f85 100644 --- a/Scripts/Engines/MLQuests/Items/DreadSpiderSilk.cs +++ b/Scripts/Engines/MLQuests/Items/DreadSpiderSilk.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1075319; } } // Dread Spider Silk - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/FragmentOfAMapDelivery.cs b/Scripts/Engines/MLQuests/Items/FragmentOfAMapDelivery.cs index 6f96e54ec..98409d80d 100644 --- a/Scripts/Engines/MLQuests/Items/FragmentOfAMapDelivery.cs +++ b/Scripts/Engines/MLQuests/Items/FragmentOfAMapDelivery.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1074533; } } // Fragment of a Map - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/FriendsOfTheLibraryApplication.cs b/Scripts/Engines/MLQuests/Items/FriendsOfTheLibraryApplication.cs index 8347c311e..a15b7c4c9 100644 --- a/Scripts/Engines/MLQuests/Items/FriendsOfTheLibraryApplication.cs +++ b/Scripts/Engines/MLQuests/Items/FriendsOfTheLibraryApplication.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1073131; } } // Friends of the Library Application - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/GiftForArielle.cs b/Scripts/Engines/MLQuests/Items/GiftForArielle.cs index ed64a03c2..b00d0de8d 100644 --- a/Scripts/Engines/MLQuests/Items/GiftForArielle.cs +++ b/Scripts/Engines/MLQuests/Items/GiftForArielle.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1074356; } } // gift for arielle public override int DefaultGumpID { get { return 0x41; } } - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/NotarizedApplication.cs b/Scripts/Engines/MLQuests/Items/NotarizedApplication.cs index 16d805ab5..23b62f5cb 100644 --- a/Scripts/Engines/MLQuests/Items/NotarizedApplication.cs +++ b/Scripts/Engines/MLQuests/Items/NotarizedApplication.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1073135; } } // Notarized Application - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/OfficialSealingWax.cs b/Scripts/Engines/MLQuests/Items/OfficialSealingWax.cs index 1385737b7..ae1df4966 100644 --- a/Scripts/Engines/MLQuests/Items/OfficialSealingWax.cs +++ b/Scripts/Engines/MLQuests/Items/OfficialSealingWax.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1072744; } } // Official Sealing Wax - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/PortraitOfTheBride.cs b/Scripts/Engines/MLQuests/Items/PortraitOfTheBride.cs index 35a459ac1..d3ffa4b0b 100644 --- a/Scripts/Engines/MLQuests/Items/PortraitOfTheBride.cs +++ b/Scripts/Engines/MLQuests/Items/PortraitOfTheBride.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1075300; } } // Portrait of the Bride - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/QuestGiverItem.cs b/Scripts/Engines/MLQuests/Items/QuestGiverItem.cs index e562e713c..fcf0c8a46 100644 --- a/Scripts/Engines/MLQuests/Items/QuestGiverItem.cs +++ b/Scripts/Engines/MLQuests/Items/QuestGiverItem.cs @@ -34,7 +34,7 @@ namespace Server.Engines.MLQuests.Items { } - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { @@ -111,7 +111,7 @@ namespace Server.Engines.MLQuests.Items { } - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void HandleInvalidTransfer( Mobile from ) { diff --git a/Scripts/Engines/MLQuests/Items/ReginasLetter.cs b/Scripts/Engines/MLQuests/Items/ReginasLetter.cs index 77fd3b9e0..d01a972d4 100644 --- a/Scripts/Engines/MLQuests/Items/ReginasLetter.cs +++ b/Scripts/Engines/MLQuests/Items/ReginasLetter.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1075306; } } // Regina's Letter - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/ReginasRing.cs b/Scripts/Engines/MLQuests/Items/ReginasRing.cs index 05d857616..c9d7b8f15 100644 --- a/Scripts/Engines/MLQuests/Items/ReginasRing.cs +++ b/Scripts/Engines/MLQuests/Items/ReginasRing.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1075305; } } // Regina's Ring - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/SealedNotesForJamal.cs b/Scripts/Engines/MLQuests/Items/SealedNotesForJamal.cs index 9b7825e35..e020061df 100644 --- a/Scripts/Engines/MLQuests/Items/SealedNotesForJamal.cs +++ b/Scripts/Engines/MLQuests/Items/SealedNotesForJamal.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1074998; } } // Sealed Notes For Jamal public override double DefaultWeight{ get{ return 1.0; } } - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/SealingWaxOrderAddressedToPetrus.cs b/Scripts/Engines/MLQuests/Items/SealingWaxOrderAddressedToPetrus.cs index 414735333..0c3f85491 100644 --- a/Scripts/Engines/MLQuests/Items/SealingWaxOrderAddressedToPetrus.cs +++ b/Scripts/Engines/MLQuests/Items/SealingWaxOrderAddressedToPetrus.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1073132; } } // Sealing Wax Order addressed to Petrus - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/SignedTuitionReimbursementForm.cs b/Scripts/Engines/MLQuests/Items/SignedTuitionReimbursementForm.cs index 5734a2bb7..cdfceece6 100644 --- a/Scripts/Engines/MLQuests/Items/SignedTuitionReimbursementForm.cs +++ b/Scripts/Engines/MLQuests/Items/SignedTuitionReimbursementForm.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1074614; } } // Signed Tuition Reimbursement Form - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/SpiritBottle.cs b/Scripts/Engines/MLQuests/Items/SpiritBottle.cs index 551e45e11..b3c47f0dd 100644 --- a/Scripts/Engines/MLQuests/Items/SpiritBottle.cs +++ b/Scripts/Engines/MLQuests/Items/SpiritBottle.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1075283; } } // Spirit bottle - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/TaintedTreeSample.cs b/Scripts/Engines/MLQuests/Items/TaintedTreeSample.cs index 64796d0bd..c48b6a8bc 100644 --- a/Scripts/Engines/MLQuests/Items/TaintedTreeSample.cs +++ b/Scripts/Engines/MLQuests/Items/TaintedTreeSample.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1074997; } } // Tainted Tree Sample - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Items/TuitionReimbursementForm.cs b/Scripts/Engines/MLQuests/Items/TuitionReimbursementForm.cs index 8c462d8b3..cddd3c7c4 100644 --- a/Scripts/Engines/MLQuests/Items/TuitionReimbursementForm.cs +++ b/Scripts/Engines/MLQuests/Items/TuitionReimbursementForm.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1074610; } } // Tuition Reimbursement Form (in triplicate) - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void AddNameProperties( ObjectPropertyList list ) { diff --git a/Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs b/Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs index 8caf58246..8edfce42d 100644 --- a/Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs +++ b/Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs @@ -11,7 +11,7 @@ namespace Server.Engines.MLQuests.Mobiles { public abstract class DoneQuestCollector : BaseCreature, IRaceChanger { - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; public abstract TextDefinition[] Offer { get; } public abstract TextDefinition[] Incomplete { get; } @@ -273,10 +273,11 @@ namespace Server.Engines.MLQuests.Mobiles public override TextDefinition[] Complete { get { return m_Complete; } } public override Type[] Needed { get { return m_Needed; } } + public override string DefaultName => "Darius"; + [Constructible] public Darius() { - Name = "Darius"; Title = "the wise"; Race = Race.Elf; Hue = Race.RandomSkinHue(); @@ -369,10 +370,11 @@ namespace Server.Engines.MLQuests.Mobiles public override TextDefinition[] Complete { get { return m_Complete; } } public override Type[] Needed { get { return m_Needed; } } + public override string DefaultName => "Nedrick"; + [Constructible] public Nedrick() { - Name = "Nedrick"; Title = "the iron worker"; Race = Race.Human; Hue = Race.RandomSkinHue(); diff --git a/Scripts/Engines/MLQuests/Mobiles/SirHelper.cs b/Scripts/Engines/MLQuests/Mobiles/SirHelper.cs index e6dc5a387..43fd1b14c 100644 --- a/Scripts/Engines/MLQuests/Mobiles/SirHelper.cs +++ b/Scripts/Engines/MLQuests/Mobiles/SirHelper.cs @@ -18,12 +18,12 @@ namespace Server.Engines.MLQuests.Mobiles private DateTime m_NextShout; - public override bool IsActiveVendor { get { return false; } } + public override string DefaultName => "Sir Helper"; + public override bool IsActiveVendor => false; [Constructible] public SirHelper() { - Name = "Sir Helper"; Title = "the Profession Guide"; // TODO: Don't display in paperdoll Hue = 0x83EA; diff --git a/Scripts/Engines/MLQuests/Objectives/CollectObjective.cs b/Scripts/Engines/MLQuests/Objectives/CollectObjective.cs index 0b05f5904..378c7dbe9 100644 --- a/Scripts/Engines/MLQuests/Objectives/CollectObjective.cs +++ b/Scripts/Engines/MLQuests/Objectives/CollectObjective.cs @@ -116,7 +116,7 @@ namespace Server.Engines.MLQuests.Objectives { private TimeSpan m_Duration; - public override bool IsTimed { get { return true; } } + public override bool IsTimed => true; public override TimeSpan Duration { get { return m_Duration; } } public TimedCollectObjective( TimeSpan duration, int amount, Type type, TextDefinition name ) diff --git a/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs b/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs index 4fe2edb5d..ff1392d2a 100644 --- a/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs +++ b/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs @@ -131,7 +131,7 @@ namespace Server.Engines.MLQuests.Objectives { private TimeSpan m_Duration; - public override bool IsTimed { get { return true; } } + public override bool IsTimed => true; public override TimeSpan Duration { get { return m_Duration; } } public TimedDeliverObjective( TimeSpan duration, Type delivery, int amount, TextDefinition name, Type destination ) diff --git a/Scripts/Engines/MLQuests/Objectives/KillObjective.cs b/Scripts/Engines/MLQuests/Objectives/KillObjective.cs index 7b3fef9e2..1d4c7c33a 100644 --- a/Scripts/Engines/MLQuests/Objectives/KillObjective.cs +++ b/Scripts/Engines/MLQuests/Objectives/KillObjective.cs @@ -96,7 +96,7 @@ namespace Server.Engines.MLQuests.Objectives { private TimeSpan m_Duration; - public override bool IsTimed { get { return true; } } + public override bool IsTimed => true; public override TimeSpan Duration { get { return m_Duration; } } public TimedKillObjective( TimeSpan duration, int amount, Type[] types, TextDefinition name ) diff --git a/Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs b/Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs index eb0bb26c1..ccdb20b86 100644 --- a/Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs +++ b/Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs @@ -6,13 +6,13 @@ namespace Server.Mobiles [CorpseName( "a giant ice worm corpse" )] public class GiantIceWorm : BaseCreature { - public override bool SubdueBeforeTame { get { return true; } } + public override bool SubdueBeforeTame => true; + public override string DefaultName => "a giant ice worm"; [Constructible] public GiantIceWorm() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Body = 89; - Name = "a giant ice worm"; BaseSoundID = 0xDC; SetStr( 216, 245 ); @@ -71,4 +71,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/PlantItem.cs b/Scripts/Engines/Plants/PlantItem.cs index 7a3e462a3..b78ca93b0 100644 --- a/Scripts/Engines/Plants/PlantItem.cs +++ b/Scripts/Engines/Plants/PlantItem.cs @@ -57,7 +57,7 @@ namespace Server.Engines.Plants public PlantSystem PlantSystem { get { return m_PlantSystem; } } - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; public override void OnSingleClick( Mobile from ) { @@ -593,4 +593,4 @@ namespace Server.Engines.Plants m_Instances.Remove( this ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/Seed.cs b/Scripts/Engines/Plants/Seed.cs index 6859c9007..cc4de7487 100644 --- a/Scripts/Engines/Plants/Seed.cs +++ b/Scripts/Engines/Plants/Seed.cs @@ -90,7 +90,7 @@ namespace Server.Engines.Plants { } - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; private int GetLabel( out string args ) { @@ -250,4 +250,4 @@ namespace Server.Engines.Plants m_PlantHue |= PlantHue.Reproduces; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs b/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs index b65769b45..8da31af01 100644 --- a/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs +++ b/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs @@ -39,16 +39,16 @@ namespace Server.Engines.Quests.Ambitious get { /* The Solen queen considers you eagerly for a moment then says,

- * + * * Yes. Yes, I think you could be of use. Normally, of course, I would handle * these things on my own, but these are busy times. Much to do, much to do. * And besides, if I am to one day become the Matriarch, then it will be good to * have experience trusting others to carry out various tasks for me. Yes.

- * + * * That is my plan, you see - I will become the next Matriarch. Our current * Matriarch is fine and all, but she won't be around forever. And when she steps * down, I intend to be the next in line. Ruling others is my destiny, you see.

- * + * * What I ask of you is quite simple. First, I need you to remove some of the * - well - competition, I suppose. Though I dare say most are hardly competent to * live up to such a title. I'm referring to the other queens of this colony, @@ -57,9 +57,9 @@ namespace Server.Engines.Quests.Ambitious * at me - this is how things work in a proper society, and ours has been more proper * than most since the dawn of time. It's them or me, and whenever I give it * any thought, I'm quite sure I'd prefer it to be them.

- * + * * I also need you to gather some zoogi fungus for me - 50 should do the trick.

- * + * * Will you accept my offer? */ return 1054060; @@ -67,7 +67,7 @@ namespace Server.Engines.Quests.Ambitious } public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } - public override bool IsTutorial{ get{ return false; } } + public override bool IsTutorial => false; public override int Picture{ get{ return 0x15C9; } } @@ -154,4 +154,4 @@ namespace Server.Engines.Quests.Ambitious } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Ambitious Solen Queen/Conversations.cs b/Scripts/Engines/Quests/Ambitious Solen Queen/Conversations.cs index d2257c01a..6e600a920 100644 --- a/Scripts/Engines/Quests/Ambitious Solen Queen/Conversations.cs +++ b/Scripts/Engines/Quests/Ambitious Solen Queen/Conversations.cs @@ -10,7 +10,7 @@ namespace Server.Engines.Quests.Ambitious get { /* The Solen queen considers you for a moment then says,

- * + * * Hmmm... I could perhaps benefit from your assistance, but you seem to be * busy with another task at the moment. Return to me when you complete whatever * it is that you're working on and maybe I can still put you to good use. @@ -19,7 +19,7 @@ namespace Server.Engines.Quests.Ambitious } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DontOfferConversation() { @@ -33,17 +33,17 @@ namespace Server.Engines.Quests.Ambitious get { /* The Solen queen smiles as you decide to help her.

- * + * * Excellent. We'll worry about the zoogi fungus later - start by eliminating * 5 queens from my colony.

That part's important, by the way; they must * be queens from my colony. Killing queens from the other solen colony does * little to help me become Matriarch of this colony and will not count * toward your task.

- * + * * Oh, and none of those nasty infiltrator queens either. They perform a necessary * duty, I suppose, spying on the other colony. I fail to see why that couldn't be * left totally to the warriors, though. Nevertheless, they do not count as well.

- * + * * Very well. Carry on. I'll be waiting for your return. */ return 1054061; @@ -67,20 +67,20 @@ namespace Server.Engines.Quests.Ambitious get { /* The Solen queen looks up as you approach.

- * + * * You're back, but you have not yet eliminated 5 queens from my colony. * Return when you have completed this task.

- * + * * Remember, by the way, that queens from the other solen colony and * infiltrator queens do not count toward your task.

- * + * * Very well. Carry on. I'll be waiting for your return. */ return 1054066; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DuringKillQueensConversation() { @@ -94,14 +94,14 @@ namespace Server.Engines.Quests.Ambitious get { /* The Solen queen looks pleased to see you.

- * + * * Splendid! You've done quite well in reducing my competition to become * the next Matriarch. Now I must ask that you gather some zoogi fungus for me. * I must practice processing it into powder of translocation.

- * + * * I believe the amount we agreed upon earlier was 50. Please return when * you have that amount and then give them to me.

- * + * * Farewell for now. */ return 1054068; @@ -125,16 +125,16 @@ namespace Server.Engines.Quests.Ambitious get { /* The Solen queen looks up as you approach.

- * + * * Do you have the zoogi fungus?

- * + * * If so, give them to me. Otherwise, go gather some and then return to me. */ return 1054070; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DuringFungiGatheringConversation() { @@ -148,11 +148,11 @@ namespace Server.Engines.Quests.Ambitious get { /* The Solen queen smiles as she takes the zoogi fungus from you.

- * + * * Wonderful! I greatly appreciate your help with these tasks. My plans are beginning * to take shape ensuring that I will be the next Matriarch. But there is still * much to be done until then.

- * + * * You've done what I've asked of you and for that I thank you. Please accept this * bag of sending and some powder of translocation as a reward. Oh, and I suppose * I should give you some gold as well. Yes, yes. Of course. @@ -191,10 +191,10 @@ namespace Server.Engines.Quests.Ambitious get { /* The Solen queen looks at you with a smile.

- * + * * While I'd like to finish conducting our business, it seems that you're a * bit overloaded with equipment at the moment.

- * + * * Perhaps you should free some room in your backpack before we proceed. */ return 1054077; @@ -206,7 +206,7 @@ namespace Server.Engines.Quests.Ambitious private bool m_PowderOfTranslocation; private bool m_Gold; - public override bool Logged{ get{ return m_Logged; } } + public override bool Logged => m_Logged; public FullBackpackConversation( bool logged, bool bagOfSending, bool powderOfTranslocation, bool gold ) { @@ -254,7 +254,7 @@ namespace Server.Engines.Quests.Ambitious get { /* The Solen queen looks up as you approach.

- * + * * Ah good, you've returned. I will conclude our business by giving you any * remaining rewards I owe you for aiding me. */ @@ -271,4 +271,4 @@ namespace Server.Engines.Quests.Ambitious System.Complete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs b/Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs index 61ef05842..e5b098255 100644 --- a/Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs +++ b/Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs @@ -8,8 +8,8 @@ namespace Server.Engines.Quests.Ambitious public abstract class BaseAmbitiousSolenQueen : BaseQuester { public abstract bool RedSolen{ get; } - - public override bool DisallowAllMoves{ get{ return false; } } + public override string DefaultName => "an ambitious solen queen"; + public override bool DisallowAllMoves => false; public BaseAmbitiousSolenQueen() { @@ -17,8 +17,6 @@ namespace Server.Engines.Quests.Ambitious public override void InitBody() { - Name = "an ambitious solen queen"; - Body = 0x30F; if ( !RedSolen ) @@ -169,7 +167,7 @@ namespace Server.Engines.Quests.Ambitious public class RedAmbitiousSolenQueen : BaseAmbitiousSolenQueen { - public override bool RedSolen{ get{ return true; } } + public override bool RedSolen => true; [Constructible] public RedAmbitiousSolenQueen() @@ -197,7 +195,7 @@ namespace Server.Engines.Quests.Ambitious public class BlackAmbitiousSolenQueen : BaseAmbitiousSolenQueen { - public override bool RedSolen{ get{ return false; } } + public override bool RedSolen => false; [Constructible] public BlackAmbitiousSolenQueen() @@ -222,4 +220,4 @@ namespace Server.Engines.Quests.Ambitious int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Collector/CollectorQuest.cs b/Scripts/Engines/Quests/Collector/CollectorQuest.cs index b98946204..118ebc5f7 100644 --- a/Scripts/Engines/Quests/Collector/CollectorQuest.cs +++ b/Scripts/Engines/Quests/Collector/CollectorQuest.cs @@ -71,9 +71,9 @@ namespace Server.Engines.Quests.Collector { /* Elwood greets you warmly, like an old friend he's not * quite sure he ever had.

- * + * * Hello. Yes. Sit down. Please. Good. Okay, stand. Up to you.

- * + * * So, what brings you to these parts... hey, wait. Just had a thought. * Would you like to do me a favor? Yes, really. You know, for old * times sake. The good ole days. You were always one of my best @@ -83,7 +83,7 @@ namespace Server.Engines.Quests.Collector * not so new - just more of the same. But don't have to tell you that. * You know, don't you. Yes. Just like old times. That's what it'll be. * You and me - together again. Ah, it's been too long.

- * + * * So what do you think? The fee will be the same as always. I'm a fair * man. You know that. So what do you say? */ @@ -92,7 +92,7 @@ namespace Server.Engines.Quests.Collector } public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } - public override bool IsTutorial{ get{ return false; } } + public override bool IsTutorial => false; public override int Picture{ get{ return 0x15A9; } } @@ -119,4 +119,4 @@ namespace Server.Engines.Quests.Collector AddConversation( new DeclineConversation() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Collector/Conversations.cs b/Scripts/Engines/Quests/Collector/Conversations.cs index 1881725fd..03023b79b 100644 --- a/Scripts/Engines/Quests/Collector/Conversations.cs +++ b/Scripts/Engines/Quests/Collector/Conversations.cs @@ -10,14 +10,14 @@ namespace Server.Engines.Quests.Collector get { /* Elwood looks up from his ale as you greet him.

- * + * * What's that? Who me? No, no. You must be looking for someone else. */ return 1055080; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DontOfferConversation() { @@ -32,18 +32,18 @@ namespace Server.Engines.Quests.Collector { /* Elwood looks a bit flustered and nearly knocks over his * bottle of ale.

- * + * * Well, I see. It's like that, is it? Yes. Well then. Okay. * You've changed. Yes. Yes, you have. Something's changed. I know * I haven't. Not me. Not good ole Elwood.

- * + * * Elwood trails off, though you can still hear him muttering softly. */ return 1055082; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DeclineConversation() { @@ -57,21 +57,21 @@ namespace Server.Engines.Quests.Collector get { /* Elwood slaps his knee and grins at you.

- * + * * Yes. Yes. That's the spirit. I knew it. Knew it when I * first saw you. You remind me so much of your dear departed * father. Or someone. Not sure. Maybe no one. But that's okay. * Ah, good times.

- * + * * Anyway, so as you know, I'm a collector. Got all kinds of * interesting things laying around back at my warehouse. * You know. You've seen it. Haven't you? Yes? No? Nevermind. * Not important.

- * + * * Right. So, always trying to add new things to my collection. * Or sometimes just get more of something. Can't have too many. * Right? Yeah? Sure.

- * + * * Let's see. Where to start. Oh, I know. Pearls. Yes. But not * just any pearls. Rainbow pearls. Yes. From the lake here in * Haven. Seems all that magic Uzeraan was throwing around when @@ -79,10 +79,10 @@ namespace Server.Engines.Quests.Collector * of the shellfish down there. Exactly, rainbow pearls. Useless * for magic, but an item worth collecting. Trust me on this. * Trust me.

- * + * * Need you to go fish some up for me. Down at the lake. Lake Haven. * Off ya go. Happy fishing!

- * + * * Elwood turns back to his ale and now seems oblivious to you. */ return 1055083; @@ -106,7 +106,7 @@ namespace Server.Engines.Quests.Collector get { /* Elwood looks up as you tap him on the shoulder.

- * + * * Good. Good. You're back. Wait. You don't have the rainbow pearls I * need. Taking a break? Yeah. Sure. There's no hurry. Let me know when * you've got all those pearls, though. I'll be here. @@ -115,7 +115,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ElwoodDuringFishConversation() { @@ -129,19 +129,19 @@ namespace Server.Engines.Quests.Collector get { /* Elwood jumps slightly when you call his name.

- * + * * What. I'm awake. Oh, It's you. Hey, look at those pearls. * Beautiful. Wow. Where'd you get those... oh right. I sent you to get * them. From the lake. Lake Haven. Great job. Gotta love rainbow * pearls. Oooh, Colors.

- * + * * Okay, let's see. Next. Need a painting. Go to the Colored Canvas and * speak to Alberta. Alberta Giacco. Best painter I've ever met. Ask * her to do a painting of you. Yes. Of you. A portrait. Never know if * you might up and become famous one day. Need to have a painting of you * in my collection. From now. Before all the fame. Go. Alberta awaits. * She's in Vesper.

- * + * * Elwood starts playing with the pearls you brought him and seems * to have forgotten you're there. */ @@ -167,15 +167,15 @@ namespace Server.Engines.Quests.Collector { /* Alberta looks up from the painting she is working on and * faces you.

- * + * * Excuse me. I don't mean to be rude, but I'm in the middle * of something, and can't... oh wait, I see. You must be the one * Elwood sent over.

- * + * * Very well. If you'll have a seat on the stool over there, we'll * get started. This will just take a few seconds. I paint quite * quickly, you see. I'll start once you are seated.

- * + * * Alberta exchanges the painting she was working on for a blank canvas. */ return 1055092; @@ -199,7 +199,7 @@ namespace Server.Engines.Quests.Collector get { /* Alberta looks at you sympathetically.

- * + * * Don't worry, this will only take a few seconds. I realize * that stool can be uncomfortable, and I apologize for that. * Perhaps I should replace it with a more comfortable chair. @@ -210,7 +210,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public AlbertaStoolConversation() { @@ -225,13 +225,13 @@ namespace Server.Engines.Quests.Collector { /* Alberta stands back from the canvas and surveys her * work.

- * + * * Not too bad. Quite good even, if I do say so myself. As always, * of course.

- * + * * Oh, you're still here. Please let Elwood know that the painting * has been completed. I'll have it sent to him once it dries.

- * + * * Alberta removes the portrait from her easel and sets * it aside to dry. */ @@ -256,7 +256,7 @@ namespace Server.Engines.Quests.Collector get { /* Alberta stops cleaning her brushes and looks your way.

- * + * * Don't worry, I'll send the painting to Elwood once it's dry. Please * let him know that the painting has been finished. */ @@ -264,7 +264,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public AlbertaAfterPaintingConversation() { @@ -279,7 +279,7 @@ namespace Server.Engines.Quests.Collector { /* Elwood yawns and stretches, then focuses his gaze * on you.

- * + * * Hello. Do I know you? Hold on a second. Yes. Yes, I do. * You were going to bring me some rainbow pearls. Wait. No. * You already did that. I remember now. Right. So go get that @@ -290,7 +290,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ElwoodDuringPainting1Conversation() { @@ -305,13 +305,13 @@ namespace Server.Engines.Quests.Collector { /* Elwood drums his fingers on the counter then looks * up at you expectantly.

- * + * * Ah, finally. I'm famished. This so-called tavern doesn't * even serve pizza, so one must have it delivered. It's an * outrage. Er... wait. Where's my pizza? Yes, my pizza. * What kind of delivery is this? Didn't even bring my pizza. * This will severely impact your tip, I'm afraid.

- * + * * Hold on a moment. You were helping me with something else, * weren't you? Ah. Yes. I've got it now. You were to have a * portrait done. Well. Good. Yes. But let's not dawdle. @@ -322,7 +322,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ElwoodDuringPainting2Conversation() { @@ -336,24 +336,24 @@ namespace Server.Engines.Quests.Collector get { /* Elwood notices you immediately and waves you over.

- * + * * You're back. Good. That's good. Hmm. You don't seem to have that * painting yet. Don't tell me Alberta refused. That's no good. I made * her what she is! She was living in the gutter when I found her. The * gutter. And she has the... what's that? Oh, she finished the portrait. * Right. Good. Can always count on Alberta. Always. Best painter in * the land.

- * + * * Just have a couple... er... wait... make that... two more task for you. * Then our business will be concluded. For now. Old chums like us will * always work together again. Yes. We go so far back. Right. I think.

- * + * * Anyway. There's a musician. A minstrel. His name's Gabriel Piete. Quite * the good singer. One of my favorites. Absolute favorite. What I'd like * is his autograph. Simple. Just his autograph. You're likely to find him * at the Conservatory of Music in Britain. He's often there. Often. Between * performances. Hurry now. There ya go.

- * + * * Elwood falls silent though his lips are still moving. It looks like * he's quietly repeating the word, "autograph." */ @@ -379,16 +379,16 @@ namespace Server.Engines.Quests.Collector { /* Gabriel sighs loudly as you address him and stops whatever * it was that he was doing.

- * + * * WHAT?!? Can you not see that I'm working here? Ugh, sometimes * I wish they'd just lock the outer doors to anyone who doesn't * belong here. So go ahead and fawn. Get it over with, and then * leave. Sooner you're out of here, the sooner I'm back to work.

- * + * * I see. So you want an autograph. Fine. If it'll get rid of you, * I'll give you my autograph. But I'll only sign some sheet music * for one of my songs. Until then, please let me get back to work.

- * + * * You can probably find some of my sheet music at one of the theaters * in the land. When I perform there, they often sell it as a souvenir. * Speak to the impresario... the theater manager. My last three @@ -415,7 +415,7 @@ namespace Server.Engines.Quests.Collector get { /* Gabriel does not look happy to see you.

- * + * * Do you have any sheet music? No. Please return when you do, * but until then please leave me to my work. */ @@ -423,7 +423,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public GabrielNoSheetMusicConversation() { @@ -444,7 +444,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public NoSheetMusicConversation() { @@ -479,10 +479,10 @@ namespace Server.Engines.Quests.Collector get { /* Gabriel looks up impatiently as you approach.

- * + * * Good. We can finally be done with one another. Here, let me * sign that and have this business completed.

- * + * * Gabriel takes the sheet music, autographs it, and then hands it back to you. */ return 1055113; @@ -510,7 +510,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public GabrielIgnoreConversation() { @@ -525,16 +525,16 @@ namespace Server.Engines.Quests.Collector { /* Elwood jumps and almost falls from his stool when you * tap his shoulder.

- * + * * Oh my. Don't do that. Scared me half to death. Sneaking up on * people like that. I don't even know you. Yes, I do. I do know you. * Ordered a pizza from you and never received it. I'm rather miffed * about that.

- * + * * No. No. Wait. Of course. Not the pizza. You're here with the * moonfire brew I wanted. Magical moonfire brew. Not sure what it is. * Just want some.

- * + * * What's that? Oh. The autograph. Gabriel Piete. Yes. Of course. * Do you have it? No. Well. Hmm. Don't sneak up on people like that. Not polite. */ @@ -542,7 +542,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ElwoodDuringAutograph1Conversation() { @@ -557,10 +557,10 @@ namespace Server.Engines.Quests.Collector { /* Elwood seems to be studying the bottom of his bottle of ale * as you approach.

- * + * * What's this? Strange. Quite strange. I could have sworn I was * drinking wine.

- * + * * Oh, hello. Yes. Good to see you. Any luck with that autograph? * Bet you thought I'd forgotten. No. Not me. Mind like a steel trap. * Can't get it open no matter how hard you try. Or something. No luck @@ -570,7 +570,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ElwoodDuringAutograph2Conversation() { @@ -584,7 +584,7 @@ namespace Server.Engines.Quests.Collector get { /* Elwood scratches his ear then notices you.

- * + * * Good day. What brings you to the Albatross? Me? An autograph? * You want my autograph? Well, I suppose. What's that? Oh. Yes. * Gabriel Piete. Yes. Get his autograph and return to me. Good day. @@ -593,7 +593,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ElwoodDuringAutograph3Conversation() { @@ -608,14 +608,14 @@ namespace Server.Engines.Quests.Collector { /* Elwood looks up eagerly as you tell him about the autographed * sheet music.

- * + * * Quite good work. Not an easy one to deal with, that one. Gabriel Piete. * Yes. Well done. Nice autograph.

- * + * * One last task. I would like a set of toy monster figurines made by the * famous toymaker, Tomas O'Neerlan. You'll find him in Trinsic. He's often * at the Tinker's Guild. Try looking there.

- * + * * You're doing quite well. Quite well indeed. Knew you would. Just like old * times. Yes. Quite good. */ @@ -640,11 +640,11 @@ namespace Server.Engines.Quests.Collector get { /* Tomas smiles freely as you speak to him.

- * + * * Ah, to be sure I can make you some toy monster figurines. * That's my work, making toys. Worry not, we'll put together * a good set of monsters for you and your figurines.

- * + * * But I'll be needing something from you before I can begin. * Here, take these enchanted paints. Using them, you can capture * a set of images of the creatures you wish me to make into toys. @@ -673,7 +673,7 @@ namespace Server.Engines.Quests.Collector get { /* Tomas greets you warmly as you approach.

- * + * * 'Tis good to see you. I see that you have not yet collected * all of the images we need. 'Tis fine, but I'll be needing * those before I can make the toy figurines. Return when you have @@ -683,7 +683,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public TomasDuringCollectingConversation() { @@ -697,7 +697,7 @@ namespace Server.Engines.Quests.Collector get { /* Tomas grins as you walk toward him.

- * + * * I see that you have collected all of the images we need. * 'Tis good. I'll begin straight away on the toy figurines. * I'll have them delivered to you when ready. Where shall I send @@ -726,11 +726,11 @@ namespace Server.Engines.Quests.Collector get { /* You watch as Elwood spins around blissfully on his stool.

- * + * * Oh. Forgive me. Didn't see you there. Whoo. Dizzy. Can't see straight. * Have you gotten those figurines yet? No. Ah. Not to worry. Keep at it. * No doubt you'll come through with those.

- * + * * Excuse me a moment. I think I need to sit down. Wait. I am sitting down. * Good then. Yes. Sitting down.

Elwood reaches out and takes hold * of the counter as if to steady himself. @@ -739,7 +739,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ElwoodDuringToys1Conversation() { @@ -753,14 +753,14 @@ namespace Server.Engines.Quests.Collector get { /* Elwood suddenly stops and beckons you over to him.

- * + * * Over here. Come here. Don't be alarmed, but I think one of the * tavernkeepers used to be a wandering healer. Said something about * the good ole days when people would just walk up and hand gold to * them. Piles of gold. Out of the blue. Can you imagine? Got so much * gold, this ex-healer decided to buy a tavern and settle down. Kind * of sad really. Can't even cure my hangover now. Nice tavern though.

- * + * * Right. Anyway. Let me know when those toy figurines are ready. * I'll be here. As always. */ @@ -768,7 +768,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ElwoodDuringToys2Conversation() { @@ -782,11 +782,11 @@ namespace Server.Engines.Quests.Collector get { /* Elwood is singing as you greet him.

- * + * * Come. Join in. It's a Gabriel Piete song. I have the sheet music * for it. It's even autographed by Gabriel Piete himself. Yes. * One of his songs. Brilliant.

- * + * * So let me see the toys. Figurines. Let's see them. Oh. You don't * have them yet. I see. Well. Okay. That's too bad. */ @@ -794,7 +794,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ElwoodDuringToys3Conversation() { @@ -808,15 +808,15 @@ namespace Server.Engines.Quests.Collector get { /* Elwood takes a sip of his ale as you address him.

- * + * * Ah. That's the stuff. Ale. Nothing better. What's that? Toy figurines * will be delivered. Right. Yes. Perhaps better than Ale. Tough one.

- * + * * Very good work. Quite. Think we're all done now. You completed everything * I asked. Would work with you again. Yes. We should.

- * + * * Ah. Yes. your payment. The usual. I think you'll be pleased.

- * + * * With that Elwood rummages around in his backpack. He eventually * pulls out a small bag and hands it to you. */ @@ -843,7 +843,7 @@ namespace Server.Engines.Quests.Collector get { /* Elwood stares at you as you approach.

- * + * * I know you. Oh yes. You've been running some errands for me. * We are about done. Noticed that your backpack is a bit full. * Might want to make some room. Won't be able to hold your payment. @@ -853,7 +853,7 @@ namespace Server.Engines.Quests.Collector } } - public override bool Logged{ get{ return m_Logged; } } + public override bool Logged => m_Logged; public FullEndConversation( bool logged ) { @@ -871,4 +871,4 @@ namespace Server.Engines.Quests.Collector System.AddObjective( new MakeRoomObjective() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Collector/Mobiles/AlbertaGiacco.cs b/Scripts/Engines/Quests/Collector/Mobiles/AlbertaGiacco.cs index 21428c1da..07e615527 100644 --- a/Scripts/Engines/Quests/Collector/Mobiles/AlbertaGiacco.cs +++ b/Scripts/Engines/Quests/Collector/Mobiles/AlbertaGiacco.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Collector { public class AlbertaGiacco : BaseQuester { + public override string DefaultName => "Alberta Giacco"; + [Constructible] public AlbertaGiacco() : base( "the respected painter" ) { @@ -25,7 +27,6 @@ namespace Server.Engines.Quests.Collector Female = true; Body = 0x191; - Name = "Alberta Giacco"; } public override void InitOutfit() @@ -91,4 +92,4 @@ namespace Server.Engines.Quests.Collector int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Collector/Mobiles/ElwoodMcCarrin.cs b/Scripts/Engines/Quests/Collector/Mobiles/ElwoodMcCarrin.cs index a127b7c83..ee536102d 100644 --- a/Scripts/Engines/Quests/Collector/Mobiles/ElwoodMcCarrin.cs +++ b/Scripts/Engines/Quests/Collector/Mobiles/ElwoodMcCarrin.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Collector { public class ElwoodMcCarrin : BaseQuester { + public override string DefaultName => "Elwood McCarrin"; + [Constructible] public ElwoodMcCarrin() : base( "the well-known collector" ) { @@ -25,7 +27,6 @@ namespace Server.Engines.Quests.Collector Female = false; Body = 0x190; - Name = "Elwood McCarrin"; } public override void InitOutfit() @@ -240,4 +241,4 @@ namespace Server.Engines.Quests.Collector int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Collector/Mobiles/GabrielPiete.cs b/Scripts/Engines/Quests/Collector/Mobiles/GabrielPiete.cs index 46de119f0..e57d81aac 100644 --- a/Scripts/Engines/Quests/Collector/Mobiles/GabrielPiete.cs +++ b/Scripts/Engines/Quests/Collector/Mobiles/GabrielPiete.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Collector { public class GabrielPiete : BaseQuester { + public override string DefaultName => "Gabriel Piete"; + [Constructible] public GabrielPiete() : base( "the renowned minstrel" ) { @@ -25,7 +27,6 @@ namespace Server.Engines.Quests.Collector Female = false; Body = 0x190; - Name = "Gabriel Piete"; } public override void InitOutfit() @@ -102,4 +103,4 @@ namespace Server.Engines.Quests.Collector int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Collector/Mobiles/TomasONeerlan.cs b/Scripts/Engines/Quests/Collector/Mobiles/TomasONeerlan.cs index 3c0c49dc1..ceb4c1ba1 100644 --- a/Scripts/Engines/Quests/Collector/Mobiles/TomasONeerlan.cs +++ b/Scripts/Engines/Quests/Collector/Mobiles/TomasONeerlan.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Collector { public class TomasONeerlan : BaseQuester { + public override string DefaultName => "Tomas O'Neerlan"; + [Constructible] public TomasONeerlan() : base( "the famed toymaker" ) { @@ -25,7 +27,6 @@ namespace Server.Engines.Quests.Collector Female = false; Body = 0x190; - Name = "Tomas O'Neerlan"; } public override void InitOutfit() @@ -108,4 +109,4 @@ namespace Server.Engines.Quests.Collector int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Core/BaseQuester.cs b/Scripts/Engines/Quests/Core/BaseQuester.cs index b433c0ce0..4d5dfbf8a 100644 --- a/Scripts/Engines/Quests/Core/BaseQuester.cs +++ b/Scripts/Engines/Quests/Core/BaseQuester.cs @@ -31,11 +31,11 @@ namespace Server.Engines.Quests protected List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override bool IsActiveVendor{ get{ return false; } } - public override bool IsInvulnerable{ get{ return true; } } - public override bool DisallowAllMoves{ get{ return true; } } + public override bool IsActiveVendor => false; + public override bool IsInvulnerable => true; + public override bool DisallowAllMoves => true; public override bool ClickTitle{ get { return false; } } - public override bool CanTeach{ get{ return false; } } + public override bool CanTeach => false; public virtual int TalkNumber{ get{ return 6146; } } // Talk @@ -125,4 +125,4 @@ namespace Server.Engines.Quests int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/Conversations.cs b/Scripts/Engines/Quests/Dark Tides/Conversations.cs index 6d7e1b90e..994ecff6e 100644 --- a/Scripts/Engines/Quests/Dark Tides/Conversations.cs +++ b/Scripts/Engines/Quests/Dark Tides/Conversations.cs @@ -12,19 +12,19 @@ namespace Server.Engines.Quests.Necro get { /* Important Quest Information

- * + * * During your quest, any important information that a * NPC gives you, will appear in a * window such as this one. You can review the information at * any time during your quest.

Getting Help

- * + * * Some of the text you will come across during your quest, will * be underlined links to the codex of * wisdom, or online help system. You can click on the text * to get detailed information on the underlined subject. You * may also access the Codex Of Wisdom by pressing "F1" or by * clicking on the "?" on the toolbar at the top of your screen.

- * + * * Context Menus

Context menus can be called up by * single left-clicking (or Shift + single left-click, if you * changed it) on most objects or NPCs in the world. Nearly @@ -60,39 +60,39 @@ namespace Server.Engines.Quests.Necro get { /* Excellent choice, young apprentice of evil!

- * + * * I will not waste our time with pleasantries. There is much work - * to be done – especially in light of the recent Paladin ambushes + * to be done � especially in light of the recent Paladin ambushes * that we have suffered. The necromantic brotherhood is working * towards the summoning of the elder daemon Kronus, who will rise * from the Well of Tears to help us finally crush the Paladin forces * that have plagued our lands for so long now.

- * + * * To summon Kronus, we must energize the Well of Tears with a series * of dark rituals. Unfortunately the rituals needed to sufficiently * energize the Well of Tears have been lost to us. Your task will be * to recover one of the ritual scrolls needed for the summoning.

- * + * * You will need to find the corpse of the Arch Necromancer Maabus, which * has been laid to rest in the tomb of elders. We believe his spirit may * have memory of where we may find the scrolls needed for the summoning. * You will need to awaken him from the slumber of death, using your * Animate Dead spell, of course.

- * + * * To reach the tomb, step onto the magical teleporter just to the * West of where I am standing.

- * + * * Once you have been teleported, follow the path, which will lead you to * the tomb of Maabus.

One more thing before you go:

- * + * * Should you get into trouble out there or should you lose your way, do * not worry. I have also given you a magical horn - a Horn of Retreat. * Play the horn at any time to open a magical gateway that leads back to this * tower.

- * + * * Should your horn run out of charges, simply * hand me the horn to have it recharged.

- * + * * Good luck friend. */ return 1060099; @@ -126,26 +126,26 @@ namespace Server.Engines.Quests.Necro { /* Maabus emits an ear-crawling screech as his body reanimates. * He turns and angrily screams at you:

- * + * * YOU INFIDEL! HOW DARE YOU AWAKEN MAABUS!?!

- * + * * Maabus continues to scream at you angrily for some time. * As he settles down, you explain to him the purpose of your visit. * Once you explain that you are on a quest to summon the elder daemon * Kronus, Maabus begins to cooperate, and begins to speak in a more * reasonable tone:

- * - * Well, why didn’t you say so? If you’re going to raise Kronus from + * + * Well, why didn�t you say so? If you�re going to raise Kronus from * the Well of Tears, you must first complete a long series of dark * rituals. I once owned one of the scrolls needed for the summoning, * but alas it was lost to me when I lost my life to a cowardly Paladin * ambush near the Paladin city of Light. They would have probably * hidden the scroll in their precious crystal cave near the city.

- * + * * There is a teleporter in the corner of this tomb. It will transport * you near the crystal cave at which I believe one of the calling scrolls * is hidden. Good luck.

- * + * * Maabus' body slumps back into the coffinas your magic expires. */ return 1060103; @@ -180,22 +180,22 @@ namespace Server.Engines.Quests.Necro * the space in front of him. As he begins to speak to you, you realize * this man is blind. You attempt to persuade the blind man that you are * a Paladin seeking to inspect the scroll of calling...

- * + * * Greetings traveler!

- * + * * You seek entrance to the Crystal Cave, home of the Calling Scroll? Hmm. * You reak of death and decay, brother. You reak of death like a Necromancer, * but yet you claim to be a Paladin in hopes that I will grant thee passage * into the cave?

- * - * Please don’t think ill of me for this, but I’m just a blind, old man looking + * + * Please don�t think ill of me for this, but I�m just a blind, old man looking * to keep the brotherhood of Paladins safe from the clutches of the elder daemon * Kronus. The Necromancers have been after this particular scroll for quite some * time, so we must take all the security precautions we can.

- * + * * Before I can let you pass into the Crystal Cave, you must speak to me the secret * word that is kept in the Scroll of Abraxus in the Vault of Secrets at the Paladin - * city of Light. It’s the only way that I can be sure you are who you claim to be, + * city of Light. It�s the only way that I can be sure you are who you claim to be, * since Necromancers cannot enter the Vault due to powerful protective magic that * the brotherhood has blessed the vault with. */ @@ -221,18 +221,18 @@ namespace Server.Engines.Quests.Necro { /* Mardoth looks at you expectantly until you tell him that you failed * to retrieve the scroll...

- * + * * You failed? Very unfortunate... So now you must find your way into - * the paladin’s Vault of Secrets, eh? Well, you won't be able to get in - * – there is a powerful magic aura that protects the Vault from all + * the paladin�s Vault of Secrets, eh? Well, you won't be able to get in + * � there is a powerful magic aura that protects the Vault from all * Necromancers. We simply cannot enter. However, that's not to say you * familiar spirit can't.

- * + * * Mardoth grins with obvious satisfaction * as he explains the details of the Summon * Familiar spell to you..., which will allow you to summon a * scavenging Horde Minion to steal the scroll.

- * + * * Very well. You are prepared to go. Take the teleporter just to the * West of where I am standing to transport * to the Paladin city of Light. Once you have arrived in the city, follow @@ -261,16 +261,16 @@ namespace Server.Engines.Quests.Necro /* You have arrived in the Vault of Secrets. You can feel the * protective magic in this place restricting you, making you * feel nearly claustrophobic.

- * + * * Just ahead of you and out of your reach, you see a collection * of scrolls and books, one of them being entitled * 'Scroll of Abraxus' . You can only assume that this scroll * holds the current password required to enter the Crystal Cave.

- * + * * This would be a good opportunity to summon * your familiar. Since your familiar is not a Necromancer, it * will not be affected by the anti-magic aura that surrounds the Vault.

- * + * * Summon your familiar with the Summon Familiar spell. */ return 1060110; @@ -304,10 +304,10 @@ namespace Server.Engines.Quests.Necro * password needed to gain passage into the Crystal Cave where the * Scroll of Calling is kept. Read the scroll (double click) and * figure out the password.

- * + * * Once you have the password, return to the Crystal Cave and speak * the password to the guard.

- * + * * If you do not know the way to the Crystal Cave from the Paladin City, * you can use the magic teleporter located just outside of the vault. */ @@ -333,18 +333,18 @@ namespace Server.Engines.Quests.Necro { /* Very well Paladin, you have proven to me your identity. * I grant thee passage.

- * - * Be careful, however – I’ve heard that the cave has been + * + * Be careful, however � I�ve heard that the cave has been * infested with a vermin of some sort. Our High Lord * Melkeer was supposed to send some troops to clear the * vermin out of the cave, but that was last week already. * I fear that he forgot.

- * + * * If you can find it in your goodness to dispose of at * least 5 of those vermin in there, I shall reward your * efforts. If however you are too busy, and I would - * understand if you were, don’t bother with the vermin.

- * + * understand if you were, don�t bother with the vermin.

+ * * You may now pass through the energy barrier to enter the * Crystal Cave. Take care honorable Paladin soul. * Walk in the light my friend. @@ -371,7 +371,7 @@ namespace Server.Engines.Quests.Necro { /* You've just slain a creature. Now is a good time to learn how * to heal yourself as a Necromancer.

- * + * * As a follower of the dark path, you are able to recover lost * hitpoints by communing with the spirit world via the skill * Spirit Speak. Learn more about it now, @@ -393,17 +393,17 @@ namespace Server.Engines.Quests.Necro get { /* I thank you for going out of your way to clean out some - * of the vermin in that cave – here is your reward: a bag + * of the vermin in that cave � here is your reward: a bag * containing 500 gold coins plus a strange and magical artifact * that should come in handy in your travels.

- * + * * Take care young Paladin! */ return 1060717; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public HorusRewardConversation() { @@ -423,7 +423,7 @@ namespace Server.Engines.Quests.Necro /* You return without the scroll of Calling? I'm afraid that * won't do. You must return to the Crystal Cave and fetch * another scroll. Use the teleporter to the West of me to - * get there. Return here when you have the scroll. Do not + * get there. Return here when you have the scroll. Do not * fail me this time, young apprentice of evil. */ return 1062058; @@ -439,7 +439,7 @@ namespace Server.Engines.Quests.Necro } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public LostCallingScrollConversation( bool fromMardoth ) { @@ -476,13 +476,13 @@ namespace Server.Engines.Quests.Necro * You can now perform the rite of calling at the Well of Tears. * This ritual will help charge the Well to prepare for the coming * of Kronus. You are prepared to do your part young Necromancer!

- * + * * Just outside of this tower, you will find a path lined with red * lanterns. Follow this path to get to the Well of Tears. Once * you have arrived at the Well, use the scroll to perform the * ritual of calling. Performing the rite will empower the well * and bring us that much closer to the arrival of Kronus.

- * + * * Once you have completed the ritual, return here for your * promised reward. */ @@ -508,25 +508,25 @@ namespace Server.Engines.Quests.Necro { /* You have done as I asked... I knew I could count on you from * the moment you walked in here!

- * + * * The forces of evil are strong within you. You will become * a great Necromancer in this life - perhaps even the greatest.

- * + * * My work for you is done here. I release you from my service * to go into the world and fight for our cause...

- * + * * Oh...I almost forgot - your reward. Here is a magical * weapon and 2000 gold for you, in the form of a check. Don't * spend it all in one place though, eh?

- * + * * Actually, before you can spend any of it at all, you will * have to cash the check at the * nearest bank. Shopkeepers never accept checks for payment, * they require cash.

- * + * * In your pack, you will find an enchanted sextant. Use this * sextant to guide you to the nearest bank.

- * + * * Farewell, and stay true to the ways of the shadow... */ return 1060133; @@ -550,18 +550,18 @@ namespace Server.Engines.Quests.Necro get { /* The banker smiles at you and greets you in a loud and robust voice...

- * + * * Well hello there adventurer! I see you've learned how to cash checks. Wonderful! * Let me tell you a bit about the banks in this world...

- * + * * Anything that you place into any bank box, can be retrieved from any other * bank box in the land. For instance, if you place an item into a bank box in * Britain, it can be retrieved from your bank box in Moonglow or any other city.

- * + * * Bank boxes are very secure. So secure, in fact, that no one can ever get into * your bank box except for yourself. Security is hard to come by these days, * but you can trust in the banking system of Britannia! We shall not let you down!

- * + * * I hope to be seeing much more of you as your riches grow! May your bank box overflow * with the spoils of your adventures.

Farewell adventurer, you are now free to * explore the world on your own. @@ -587,7 +587,7 @@ namespace Server.Engines.Quests.Necro get { /* If you are leaving the tower, you should learn about the Radar Map.

- * + * * The Radar Map (or Overhead View) can be opened by pressing 'ALT-R' * on your keyboard. It shows your immediate surroundings from a bird's * eye view.

Pressing ALT-R twice, will enlarge the Radar Map a @@ -598,10 +598,10 @@ namespace Server.Engines.Quests.Necro } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public RadarConversation() { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs b/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs index c249a0b0a..5241d2ab1 100644 --- a/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs +++ b/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs @@ -65,34 +65,34 @@ namespace Server.Engines.Quests.Necro * of his translucently pale and heavily wrinkled skin, turns * to you and gives you a half-cocked grin that makes you * feel somewhat uneasy.

- * + * * After a short pause, he begins to speak to you...

- * + * * Hmm. What's this? Another budding Necromancer to join the * ranks of Evil? Here... let me take a look at you... Ah * yes... Very Good! I sense the forces of evil are strong - * within you, child – but you need training so that you can + * within you, child � but you need training so that you can * learn to focus your skills against those aligned against * our cause. You are destined to become a legendary * Necromancer - with the proper training, that only I can * give you.

- * + * * Mardoth pauses just long enough to give you a wide, * skin-crawling grin.

- * + * * Let me introduce myself. I am Mardoth, the guildmaster of * the Necromantic Brotherhood. I have taken it upon myself * to train anyone willing to learn the dark arts of Necromancy. * The path of destruction, decay and obliteration is not an * easy one. Only the most evil and the most dedicated can * hope to master the sinister art of death.

- * - * I can lend you training and help supply you with equipment – + * + * I can lend you training and help supply you with equipment � * in exchange for a few services rendered by you, of course. * Nothing major, just a little death and destruction here and * there - the tasks should be easy as a tasty meat pie for one * as treacherous and evil as yourself.

- * + * * What do you say? Do we have a deal? */ return 1060094; @@ -100,7 +100,7 @@ namespace Server.Engines.Quests.Necro } public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } - public override bool IsTutorial{ get{ return true; } } + public override bool IsTutorial => true; public override int Picture{ get{ return 0x15B5; } } @@ -150,4 +150,4 @@ namespace Server.Engines.Quests.Necro return false; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/Mobiles/Horus.cs b/Scripts/Engines/Quests/Dark Tides/Mobiles/Horus.cs index 9bcfff4ac..af7264efa 100644 --- a/Scripts/Engines/Quests/Dark Tides/Mobiles/Horus.cs +++ b/Scripts/Engines/Quests/Dark Tides/Mobiles/Horus.cs @@ -13,6 +13,8 @@ namespace Server.Engines.Quests.Necro { public class Horus : BaseQuester { + public override string DefaultName => "Horus"; + [Constructible] public Horus() : base( "the Guardian" ) { @@ -24,8 +26,6 @@ namespace Server.Engines.Quests.Necro Hue = 0x83F3; Body = 0x190; - - Name = "Horus"; } public override void InitOutfit() @@ -195,4 +195,4 @@ namespace Server.Engines.Quests.Necro int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/Mobiles/Maabus.cs b/Scripts/Engines/Quests/Dark Tides/Mobiles/Maabus.cs index 7cc7707f7..fbdff3ce3 100644 --- a/Scripts/Engines/Quests/Dark Tides/Mobiles/Maabus.cs +++ b/Scripts/Engines/Quests/Dark Tides/Mobiles/Maabus.cs @@ -7,6 +7,8 @@ namespace Server.Engines.Quests.Necro { public class Maabus : BaseQuester { + public override string DefaultName => "Maabus"; + public Maabus() { } @@ -14,7 +16,6 @@ namespace Server.Engines.Quests.Necro public override void InitBody() { Body = 0x94; - Name = "Maabus"; } public Maabus( Serial serial ) : base( serial ) @@ -44,4 +45,4 @@ namespace Server.Engines.Quests.Necro int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs b/Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs index 862f20f23..68e045485 100644 --- a/Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs +++ b/Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs @@ -10,6 +10,8 @@ namespace Server.Engines.Quests.Necro { public class Mardoth : BaseQuester { + public override string DefaultName => "Mardoth"; + [Constructible] public Mardoth() : base( "the Ancient Necromancer" ) { @@ -21,8 +23,6 @@ namespace Server.Engines.Quests.Necro Hue = 0x8849; Body = 0x190; - - Name = "Mardoth"; } public override bool OnDragDrop( Mobile from, Item dropped ) @@ -227,4 +227,4 @@ namespace Server.Engines.Quests.Necro int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Conversations.cs b/Scripts/Engines/Quests/Emino's Undertaking/Conversations.cs index ca8ea6495..f53115bdf 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Conversations.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Conversations.cs @@ -12,19 +12,19 @@ namespace Server.Engines.Quests.Ninja get { /* Important Quest Information

- * + * * During your quest, any important information that a * NPC gives you, will appear in a * window such as this one. You can review the information at * any time during your quest.

Getting Help

- * + * * Some of the text you will come across during your quest, will * be underlined links to the codex of * wisdom, or online help system. You can click on the text * to get detailed information on the underlined subject. You * may also access the Codex Of Wisdom by pressing "F1" or by * clicking on the "?" on the toolbar at the top of your screen.

- * + * * Context Menus

Context menus can be called up by * single left-clicking (or Shift + single left-click, if you * changed it) on most objects or NPCs in the world. Nearly @@ -53,19 +53,19 @@ namespace Server.Engines.Quests.Ninja { get { - /* Ah, another fledgling unfurls its wings. Welcome to my + /* Ah, another fledgling unfurls its wings. Welcome to my * home young one.

- * - * I am Daimyo Emino, a passionate collector of sorts. + * + * I am Daimyo Emino, a passionate collector of sorts. * One who is vengeful towards those impeding my reign.

- * - * You have the look of someone who could help me but - * your skills are untested. Are you willing to prove + * + * You have the look of someone who could help me but + * your skills are untested. Are you willing to prove * your mettle as my hireling?

- * - * Elite Ninja Zoel awaits you in the backyard. He will - * lead you to the first trial. You will be directed - * further when you arrive at your destination. You + * + * Elite Ninja Zoel awaits you in the backyard. He will + * lead you to the first trial. You will be directed + * further when you arrive at your destination. You * should speak to him before exploring the yard or cave entrance. */ return 1063175; @@ -89,11 +89,11 @@ namespace Server.Engines.Quests.Ninja get { /* To view the surrounding area, you should learn about the Radar Map.

- * + * * The Radar Map (or Overhead View) can be opened by pressing 'ALT-R' * on your keyboard. It shows your immediate surroundings from a * bird's eye view.

- * + * * Pressing ALT-R twice, will enlarge the Radar Map a little. * Use the Radar Map often as you travel throughout the world * to familiarize yourself with your surroundings. @@ -102,7 +102,7 @@ namespace Server.Engines.Quests.Ninja } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public RadarConversation() { @@ -116,21 +116,21 @@ namespace Server.Engines.Quests.Ninja get { /* Zoel studies your face as you approach him. Wryly, he says:

- * - * Daimyo Emino has sent another already? The stains from the + * + * Daimyo Emino has sent another already? The stains from the * last have not yet dried!

- * - * No matter, we’ll finish you off and clean it all at once, eh?

- * + * + * No matter, we�ll finish you off and clean it all at once, eh?

+ * * Now to the point, your only task is to survive in the abandoned inn.

- * - * You will be instructed when you need to act and when you should + * + * You will be instructed when you need to act and when you should * return to one of us.

- * + * * Only a true Ninja is deft enough to finish and remain alive.

- * + * * Your future... or your demise... lies in this cave beyond.

- * + * * Now go. */ return 1063177; @@ -154,11 +154,11 @@ namespace Server.Engines.Quests.Ninja get { /* A glowing archway stands before you.

- * - * To either side of its frame are mounted demon heads, + * + * To either side of its frame are mounted demon heads, * breathing fire and watching your every move.

- * - * To pass through, you must first vanish from the demons’ + * + * To pass through, you must first vanish from the demons� * sight. Only then can you slowly traverse the entryway. */ return 1063180; @@ -181,15 +181,15 @@ namespace Server.Engines.Quests.Ninja { get { - /* You’ll need to hide in order to pass through the door.

- * - * To find out how to use active skills, visit the - * Codex of Wisdom. - * To activate a skill, locate it on your skills - * list and click the blue button located to the - * left of the skill's name.

Once you have + /* You�ll need to hide in order to pass through the door.

+ * + * To find out how to use active skills, visit the + * Codex of Wisdom. + * To activate a skill, locate it on your skills + * list and click the blue button located to the + * left of the skill's name.

Once you have * successfully hidden, you may move slowly through the door. - * + * */ return 1063181; } @@ -207,10 +207,10 @@ namespace Server.Engines.Quests.Ninja get { /* - * Through the door lies a short passageway. - * The path ends abruptly at a strange tile on the floor. - * The special tile is known as a teleporter. - * Step on the teleporter tile and you will be transported + * Through the door lies a short passageway. + * The path ends abruptly at a strange tile on the floor. + * The special tile is known as a teleporter. + * Step on the teleporter tile and you will be transported * to a new location. */ return 1063182; @@ -234,15 +234,15 @@ namespace Server.Engines.Quests.Ninja get { /* Daimyo Emino smiles as you approach him:

- * - * I see that you have survived both the first trial and Zoel’s temper.

- * + * + * I see that you have survived both the first trial and Zoel�s temper.

+ * * For that you have been rewarded with Leggings and Gloves * befitting your occupation. The material is the only armor * a True Ninja needs.

- * - * You have yet to prove yourself fully, young hireling. - * Another trial must be met. Off to Zoel you go. + * + * You have yet to prove yourself fully, young hireling. + * Another trial must be met. Off to Zoel you go. * Bring him this note so he knows we have spoken. */ return 1063184; @@ -270,7 +270,7 @@ namespace Server.Engines.Quests.Ninja } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public LostNoteConversation() { @@ -285,24 +285,24 @@ namespace Server.Engines.Quests.Ninja { /* Zoel quickly grabs the scroll from your * hand and reads the note:

- * - * Still alive then? You’ll have to impress me - * further before I will give my approval of + * + * Still alive then? You�ll have to impress me + * further before I will give my approval of * you to Daimyo Emino.

- * + * * You must return to the inn and begin the next trial.

- * - * We believe an associate has, shall we say, + * + * We believe an associate has, shall we say, * inadvertently negated our contract.

- * + * * Find out what information you can and return * to Daimyo Emino with the news. And be careful * not to lose your head.

- * - * The Blue Teleporter Tile in Daimyo Emino’s - * residence will lead you to your fate. + * + * The Blue Teleporter Tile in Daimyo Emino�s + * residence will lead you to your fate. * I suggest you hurry.

- * + * * ...And take care to tread softly. There * is no greater traitor than a heavy footfall upon a path. */ @@ -326,24 +326,24 @@ namespace Server.Engines.Quests.Ninja { get { - /* You quietly approach the door and see - * a woman named Jedah Entille speaking - * to a shady figure in dark clothing. - * You move closer so you can overhear - * the conversation. Fortunately, your + /* You quietly approach the door and see + * a woman named Jedah Entille speaking + * to a shady figure in dark clothing. + * You move closer so you can overhear + * the conversation. Fortunately, your * entrance did not alert the preoccupied party.

- * - * Jedah’s brash voice permeates the air:

- * - * Now that it is hidden, we’ll hide out here - * until Daimyo Emino forgets about us. - * Once he realizes his beloved sword is missing, - * he’ll surely start looking for the thieves. + * + * Jedah�s brash voice permeates the air:

+ * + * Now that it is hidden, we�ll hide out here + * until Daimyo Emino forgets about us. + * Once he realizes his beloved sword is missing, + * he�ll surely start looking for the thieves. * We will be long gone by that time.

- * - * After overhearing the conversation, - * you understand why you were sent on - * this trial. You must immediately tell + * + * After overhearing the conversation, + * you understand why you were sent on + * this trial. You must immediately tell * Daimyo Emino what you have learned. * */ return 1063196; @@ -366,36 +366,36 @@ namespace Server.Engines.Quests.Ninja { get { - /* Daimyo Emino frowns as you relay the information. + /* Daimyo Emino frowns as you relay the information. * He pauses for a moment before speaking to you:

- * - * Jedah was once one of my most promising students, + * + * Jedah was once one of my most promising students, * but her greed will be her downfall.

- * - * I will send one of my disciples to deal with her later. + * + * I will send one of my disciples to deal with her later. * It is more important to get that sword back first.

- * - * I’m counting on you to find it. She would have kept it - * close to her. Take the White Teleporter, located in my - * backyard, and check inside boxes and chests around the - * treasure room of the inn and return it to me when you + * + * I�m counting on you to find it. She would have kept it + * close to her. Take the White Teleporter, located in my + * backyard, and check inside boxes and chests around the + * treasure room of the inn and return it to me when you * find it.

- * - * Be very careful. Jedah was an expert with traps and no - * doubt she’s protecting the sword with them.

- * - * If you find a trap, try timing it and you may be able + * + * Be very careful. Jedah was an expert with traps and no + * doubt she�s protecting the sword with them.

+ * + * If you find a trap, try timing it and you may be able * to avoid damage.

- * - * I’ve provided you with several heal potions in case you + * + * I�ve provided you with several heal potions in case you * become injured.

- * - * In the bag you will also find more clothing appropriate + * + * In the bag you will also find more clothing appropriate * to your new found profession.

- * - * Please return the sword to me. I implore you not to take + * + * Please return the sword to me. I implore you not to take * anything else that may be hidden in the Inn.

- * + * * Thank you. */ return 1063199; @@ -418,10 +418,10 @@ namespace Server.Engines.Quests.Ninja { get { - /* A narrow hallway greets the teleporter. - * The enclosed space is the perfect setting - * for dangerous traps. Walk through the - * hallway being careful to avoid the traps. + /* A narrow hallway greets the teleporter. + * The enclosed space is the perfect setting + * for dangerous traps. Walk through the + * hallway being careful to avoid the traps. * You may be able to time the traps to avoid injury. */ return 1063201; @@ -444,11 +444,11 @@ namespace Server.Engines.Quests.Ninja { get { - /* The lid of the chest refuses to budge at first, + /* The lid of the chest refuses to budge at first, * but slowly you are able to pry the lid open.

- * - * Inside lies the sword you have been in search of. - * You quickly take the sword and stash it in your backpack. + * + * Inside lies the sword you have been in search of. + * You quickly take the sword and stash it in your backpack. * Bring the sword back to Daimyo Emino. */ return 1063203; @@ -471,12 +471,12 @@ namespace Server.Engines.Quests.Ninja { get { - /* Screams echo through the chamber as you walk - * away from the chest. Jedah’s Henchmen have + /* Screams echo through the chamber as you walk + * away from the chest. Jedah�s Henchmen have * become cognizant of your presence.

- * - * It is time for your Ninja Spirit to come alive. - * Slay 3 of the Henchmen before returning to Daimyo Emino. + * + * It is time for your Ninja Spirit to come alive. + * Slay 3 of the Henchmen before returning to Daimyo Emino. */ return 1063205; } @@ -503,7 +503,7 @@ namespace Server.Engines.Quests.Ninja } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public ContinueSlayHenchmenConversation() { @@ -517,7 +517,7 @@ namespace Server.Engines.Quests.Ninja get { /* Go to Daimyo Emino. Go back through the chamber the way you came.

- * + * * Give Daimyo Emino the sword when you've returned to his side. */ return 1063211; @@ -545,7 +545,7 @@ namespace Server.Engines.Quests.Ninja } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public LostSwordConversation() { @@ -562,9 +562,9 @@ namespace Server.Engines.Quests.Ninja * To the right of the cave entrance you will find a luminous oval * object known as a Moongate, step through it and you'll * find yourself in Zento.

- * + * * You may want to visit Ansella Gryen when you arrive.

- * + * * Please accept the gifts I have placed in your pack. You * have earned them. Farewell for now. */ @@ -590,7 +590,7 @@ namespace Server.Engines.Quests.Ninja { /* You have earned these gifts for returning the sword. * For that I thank you.

- * + * * However, your reward has been lessened by your greed * in the treasure room. Do not think I did not notice your full pockets. */ @@ -607,4 +607,4 @@ namespace Server.Engines.Quests.Ninja System.Complete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs b/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs index 6f800ed53..a1aac3064 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs @@ -65,7 +65,7 @@ namespace Server.Engines.Quests.Ninja } public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } - public override bool IsTutorial{ get{ return true; } } + public override bool IsTutorial => true; public override int Picture{ get{ return 0x15D5; } } @@ -156,4 +156,4 @@ namespace Server.Engines.Quests.Ninja return false; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs b/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs index 1efe74b70..a8ea9342d 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs @@ -21,7 +21,7 @@ namespace Server.Engines.Quests.Ninja { } - public override bool IsDecoContainer{ get{ return false; } } + public override bool IsDecoContainer => false; private void GenerateTreasure() { @@ -145,4 +145,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Emino.cs b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Emino.cs index 05ca80e85..bfde68ccb 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Emino.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Emino.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Ninja { public class Emino : BaseQuester { + public override string DefaultName => "Daimyo Emino"; + [Constructible] public Emino() : base( "the Notorious" ) { @@ -21,7 +23,6 @@ namespace Server.Engines.Quests.Ninja Female = false; Body = 0x190; - Name = "Daimyo Emino"; } public override void InitOutfit() @@ -224,4 +225,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/EnshroudedFigure.cs b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/EnshroudedFigure.cs index b573c9d52..ada506448 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/EnshroudedFigure.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/EnshroudedFigure.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Ninja { public class EnshroudedFigure : BaseQuester { + public override string DefaultName => "an enshrouded figure"; + [Constructible] public EnshroudedFigure() { @@ -20,7 +22,6 @@ namespace Server.Engines.Quests.Ninja Hue = 0x8401; Female = false; Body = 0x190; - Name = "enshrouded figure"; } public override void InitOutfit() @@ -53,4 +54,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs index b3de84124..d79b057b8 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs @@ -7,6 +7,8 @@ namespace Server.Engines.Quests.Ninja { public class Henchman : BaseCreature { + public override string DefaultName => "a henchman"; + [Constructible] public Henchman() : base( AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { @@ -14,7 +16,6 @@ namespace Server.Engines.Quests.Ninja Hue = Utility.RandomSkinHue(); Body = 0x190; - Name = "a henchman"; Utility.AssignRandomHair( this ); Utility.AssignRandomFacialHair( this ); @@ -32,7 +33,7 @@ namespace Server.Engines.Quests.Ninja SetSkill( SkillName.Tactics, 50.0 ); } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public Henchman( Serial serial ) : base( serial ) { @@ -52,4 +53,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/JedahEntille.cs b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/JedahEntille.cs index 3608dfd25..b4871f883 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/JedahEntille.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/JedahEntille.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Ninja { public class JedahEntille : BaseQuester { + public override string DefaultName => "Jedah Entille"; + [Constructible] public JedahEntille() : base( "the Silent" ) { @@ -20,7 +22,6 @@ namespace Server.Engines.Quests.Ninja Hue = 0x83FE; Female = true; Body = 0x191; - Name = "Jedah Entille"; } public override void InitOutfit() @@ -57,4 +58,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Zoel.cs b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Zoel.cs index dfded5c45..9597288ce 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Zoel.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Zoel.cs @@ -9,6 +9,8 @@ namespace Server.Engines.Quests.Ninja { public class Zoel : BaseQuester { + public override string DefaultName => "Elite Ninja Zoel"; + [Constructible] public Zoel() : base( "the Masterful Tactician" ) { @@ -22,7 +24,6 @@ namespace Server.Engines.Quests.Ninja Female = false; Body = 0x190; - Name = "Elite Ninja Zoel"; } public override void InitOutfit() @@ -135,4 +136,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Conversations.cs b/Scripts/Engines/Quests/Haochi's Trials/Conversations.cs index 5d6c5e5af..43f4eee01 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Conversations.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Conversations.cs @@ -12,21 +12,21 @@ namespace Server.Engines.Quests.Samurai get { /* Important Quest Information

- * + * * During your quest, any important information that a * NPC gives you, will appear in a window * such as this one. You can review the information at any time during your * quest.

- * + * * Getting Help

- * + * * Some of the text you will come across during your quest, * will be underlined links to the codex of wisdom, * or online help system. You can click on the text to get detailed information * on the underlined subject. You may also access the Codex Of Wisdom by * pressing "F1" or by clicking on the "?" on the toolbar at the top of * your screen.

Context Menus

- * + * * Context menus can be called up by single left-clicking (or Shift + single * left-click, if you changed it) on most objects or NPCs in the world. * Nearly everything, including your own avatar will have context menus available. @@ -54,11 +54,11 @@ namespace Server.Engines.Quests.Samurai get { /* To view the surrounding area, you should learn about the Radar Map.

- * + * * The Radar Map (or Overhead View) can be opened by pressing 'ALT-R' * on your keyboard. It shows your immediate surroundings from a * bird's eye view.

- * + * * Pressing ALT-R twice, will enlarge the Radar Map a little. * Use the Radar Map often as you travel throughout the world * to familiarize yourself with your surroundings. @@ -67,7 +67,7 @@ namespace Server.Engines.Quests.Samurai } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public RadarConversation() { @@ -81,24 +81,24 @@ namespace Server.Engines.Quests.Samurai get { /* Greetings. I am Daimyo Haochi, the Feudal Lord of this region.

- * + * * Since you are here at my side, you must wish to learn the ways of the Samurai.

- * - * Wielding a blade is easy, anyone can grasp a sword’s hilt. Learning how to + * + * Wielding a blade is easy, anyone can grasp a sword�s hilt. Learning how to * fight properly and skillfully is to become an Armsman.

- * + * * Learning how to master weapons, and even more importantly when not to use * them, is the Way of the Warrior. The Way of the Samurai. The Code of the * Bushido. That is why you are here.

- * + * * You will go through 7 trials to prove your adherence to the Samurai code.

- * + * * The first trial will test your decision making skills. You only have to enter * the area beyond the green passageway.

- * + * * Do not attempt to hurry your trials. The guards will only let you through * to each trial when I have deemed you ready.

- * + * * As a last resort you may use the golden teleporter tiles in each trial area * but do so at your own risk. You may not be able to return and complete your * trials once you have chosen to escape. @@ -124,20 +124,20 @@ namespace Server.Engines.Quests.Samurai get { /* Beyond you are two troubled groups.

- * + * * The Cursed Souls were once proud warriors that were ensorcelled * by an evil mage. The mage trapped and killed them later but the spell * has not lifted from their souls in death.

- * + * * The Young Ronin were former Samurai in training who lost their way. * They are loyal only to those with enough coin in their pocket.

- * + * * You must decide who needs to be fought to the death. You may wish to * review combat techniques as well as * information on healing yourself.

- * + * * Return to Daimyo Haochi after you have finished with your trial.

- * + * * If you should die during any of your trials, visit one of the Ankh Shrines * and you will be resurrected. You should retrieve your belongings from your * body before returning to the Daimyo or you may not be able to return to your corpse. @@ -175,7 +175,7 @@ namespace Server.Engines.Quests.Samurai } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; private bool m_CursedSoul; @@ -214,9 +214,9 @@ namespace Server.Engines.Quests.Samurai /* It is good that you rid the land of the Cursed Souls so they can * be at peace in death. They had been cursed for doing what they * thought was an honorable deed. Now they can have respect in their death.

- * + * * I have placed a reward in your pack.

- * + * * The second trial will test your courage. You only have to follow the yellow * path to see what awaits you. */ @@ -226,9 +226,9 @@ namespace Server.Engines.Quests.Samurai { /* It is good that you rid the land of those dishonorable Samurai. * Perhaps they will learn a greater lesson in death.

- * + * * I have placed a reward in your pack.

- * + * * The second trial will test your courage. You only have to follow * the yellow path to see what awaits you. */ @@ -277,10 +277,10 @@ namespace Server.Engines.Quests.Samurai /* Beyond the guards is a test of courage. You must face your fear and attack a * great beast. You must choose which beast to slay for there is more than * one beyond the courtyard doors.

- * + * * The imp entered the courtyard unaware of its surroundings. The dragon came - * knowingly, hunting for the flesh of humans – A feast for the beast.

- * + * knowingly, hunting for the flesh of humans � A feast for the beast.

+ * * You must rid the courtyard of these beasts but you may only choose one to * attack. Go and choose wisely. */ @@ -308,14 +308,14 @@ namespace Server.Engines.Quests.Samurai { /* You faced the dragon knowing it would be your certain death. * That is the courage of a Samurai.

- * + * * Your spirit speaks as a Samurai already.

- * + * * In these lands, death is not forever. The shrines can make you whole * again as can a helpful mage or healer.

- * + * * Seek them out when you have been mortally wounded.

- * + * * The next trial will test your benevolence. You only have to walk the blue path. */ return 1063060; @@ -324,16 +324,16 @@ namespace Server.Engines.Quests.Samurai { /* Fear remains in your eyes but you have learned that not all is * what it appears to be.

- * + * * You must have known the dragon would slay you instantly. * You elected the weaker opponent though the imp did not come * here to destroy. You have much to learn.

- * + * * In these lands, death is not forever. The shrines can make you whole * again as can a helpful mage or healer.

- * + * * Seek them out when you have been mortally wounded.

- * + * * The next trial will test your benevolence. You only have to walk the blue path. */ return 1063059; @@ -380,7 +380,7 @@ namespace Server.Engines.Quests.Samurai { /* A pack of wolves circle your feet. They have been injured and are in pain. * A quick death will end their suffering.

- * + * * Use your Honorable Execution skill or other means to finish off a wounded wolf. * Do so and return to Daimyo Haochi. */ @@ -405,13 +405,13 @@ namespace Server.Engines.Quests.Samurai get { /* Daimyo Haochi smiles as you walk up to him. Quietly he says:

- * + * * A Samurai understands the need to help others even as he wields a blade against * them.

- * + * * You have shown compassion. A true Samurai is benevolent even to an enemy. * For this you have been rewarded.

- * + * * And now you must prove yourself again. Walk the red path. * We will talk again later. */ @@ -437,17 +437,17 @@ namespace Server.Engines.Quests.Samurai { /* You approach a disheveled gypsy standing near a small shed. * You sense that she has not eaten nor bathed in quite some time.

- * + * * Around her is a large colony of mangy and diseased cats. It appears - * she has spent what little money she’s earned to feed the cats instead + * she has spent what little money she�s earned to feed the cats instead * of herself.

- * + * * You have a decision to make. You can give her gold so she can buy some * food for her animals and herself. You can also remove the necessity * of the extra mouths to feed so she may concentrate on saving herself.

- * + * * If you elect to give the gypsy money, you can do so by clicking your stack - * of gold and selecting ‘1’. Then dragging it and dropping it on the Gypsy. + * of gold and selecting �1�. Then dragging it and dropping it on the Gypsy. */ return 1063067; } @@ -475,7 +475,7 @@ namespace Server.Engines.Quests.Samurai * By denying the gypsy her animals, you negate the respect she is due. * Perhaps you will have learned something to use next time a similar * situation arises.

- * + * * And now you must prove yourself again. Please retrieve my katana * from the treasure room and return it to me. */ @@ -485,15 +485,15 @@ namespace Server.Engines.Quests.Samurai { /* You showed respect by helping another out while allowing the gypsy * what little dignity she has left.

- * + * * Now she will be able to feed herself and gain enough energy to walk * to her camp.

- * - * The cats are her family members– cursed by an evil mage.

- * + * + * The cats are her family members� cursed by an evil mage.

+ * * Once she has enough strength to walk back to the camp, she will be * able to undo the spell.

- * + * * You have been rewarded for completing your trial. And now you must * prove yourself again.

Please retrieve my katana from the * treasure room and return it to me. @@ -544,7 +544,7 @@ namespace Server.Engines.Quests.Samurai * you walk into the Daimyo's treasure cache. A vast fortune in gold, * gemstones, and jewelry is stored here! Surely, the Daimyo wouldn't * miss a single small item...

- * + * * You spot the sword quickly amongst the cache of gemstones and other valuables. * In one quick motion you retrieve it and stash it in your pack. */ @@ -573,7 +573,7 @@ namespace Server.Engines.Quests.Samurai } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public LostSwordConversation() { @@ -590,12 +590,12 @@ namespace Server.Engines.Quests.Samurai { /* I thank you for returning this sword. However, you should admonished * for also taking treasure that was not asked for nor given back.

- * + * * Think about your actions youngling.

- * + * * Your training is nearly complete. Before you have your final trial, * you should pay homage to Samurai who came before you.

- * + * * Go into the Altar Room and light a candle for them. * Afterwards, return to me. */ @@ -605,10 +605,10 @@ namespace Server.Engines.Quests.Samurai { /* Thank you for returning this sword to me and leaving the remaining * treasure alone.

- * + * * Your training is nearly complete. Before you have your final trial, * you should pay homage to Samurai who came before you.

- * + * * Go into the Altar Room and light a candle for them. Afterwards, return to me. */ return 1063076; @@ -654,12 +654,12 @@ namespace Server.Engines.Quests.Samurai get { /* You have done well young Samurai. There is but one thing left to do.

- * + * * In the final room is the holding cell containing young Ninjas who came to * take my life. They were caught and placed in my custody.

- * + * * Take care of these miscreants and show them where your loyalty lies.

- * + * * This is your final act as a Samurai in training. */ return 1063079; @@ -684,16 +684,16 @@ namespace Server.Engines.Quests.Samurai { /* You have proven yourself young one. You will continue to improve as your skills * are honed with age.

- * + * * Now it is time for you to explore the lands. Beyond this path lies Zento * City, your future home. On these grounds you will find a golden oval object * known as a Moongate, step through it and you'll find yourself in Zento.

- * + * * You may want to visit Ansella Gryen when you arrive.

- * + * * You have learned the ways. You are an honorable warrior, a Samurai in * the highest regards.

- * + * * Please accept the gifts I have placed in your pack. You have earned them. * Farewell for now. */ @@ -710,4 +710,4 @@ namespace Server.Engines.Quests.Samurai System.Complete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs b/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs index fcf4b5d38..2e9082115 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs @@ -64,14 +64,14 @@ namespace Server.Engines.Quests.Samurai { /* As you enter the courtyard you notice a faded sign. * It reads:

- * + * * Welcome to your new home, Samurai.

- * + * * Though your skills are only a shadow of what they can be some day, * you must prove your adherence to the code of the Bushido.

- * + * * Seek Daimyo Haochi for guidance.

- * + * * Will you accept the challenge? */ return 1063023; @@ -79,7 +79,7 @@ namespace Server.Engines.Quests.Samurai } public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } - public override bool IsTutorial{ get{ return true; } } + public override bool IsTutorial => true; public override int Picture{ get{ return 0x15D7; } } @@ -148,4 +148,4 @@ namespace Server.Engines.Quests.Samurai return false; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisKatanaGenerator.cs b/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisKatanaGenerator.cs index d5facf07f..7e1441402 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisKatanaGenerator.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisKatanaGenerator.cs @@ -6,11 +6,12 @@ namespace Server.Engines.Quests.Samurai { public class HaochisKatanaGenerator : Item { + public override string DefaultName => "Haochi's katana generator"; + [Constructible] public HaochisKatanaGenerator() : base( 0x1B7B ) { Visible = false; - Name = "Haochi's katana generator"; Movable = false; } @@ -77,4 +78,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs b/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs index 78bad1a45..01381fc44 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs @@ -20,7 +20,7 @@ namespace Server.Engines.Quests.Samurai { } - public override bool IsDecoContainer{ get{ return false; } } + public override bool IsDecoContainer => false; private void GenerateTreasure() { @@ -102,4 +102,4 @@ namespace Server.Engines.Quests.Samurai Timer.DelayCall( TimeSpan.Zero, new TimerCallback( GenerateTreasure ) ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs index 406079fcf..8fd1ba127 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs @@ -7,10 +7,11 @@ namespace Server.Engines.Quests.Samurai [CorpseName( "a cursed soul corpse" )] public class CursedSoul : BaseCreature { + public override string DefaultName => "a cursed soul"; + [Constructible] public CursedSoul() : base( AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a cursed soul"; Body = 3; BaseSoundID = 471; @@ -67,4 +68,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs index 04367daac..b35ab8a55 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs @@ -5,10 +5,11 @@ namespace Server.Engines.Quests.Samurai { public class DeadlyImp : BaseCreature { + public override string DefaultName => "a deadly imp"; + [Constructible] public DeadlyImp() : base( AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a deadly imp"; Body = 74; BaseSoundID = 422; Hue = 0x66A; @@ -77,4 +78,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs index 94b7f8170..640445590 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs @@ -5,10 +5,11 @@ namespace Server.Engines.Quests.Samurai { public class DiseasedCat : BaseCreature { + public override string DefaultName => "a diseased cat"; + [Constructible] public DiseasedCat() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a diseased cat"; Body = 0xC9; Hue = Utility.RandomAnimalHue(); BaseSoundID = 0x69; @@ -33,7 +34,7 @@ namespace Server.Engines.Quests.Samurai VirtualArmor = 8; } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public DiseasedCat( Serial serial ) : base( serial ) { @@ -51,9 +52,6 @@ namespace Server.Engines.Quests.Samurai base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - - if( Name == "a deseased cat" ) - Name = "a diseased cat"; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs index 3350858ca..1adfd45b1 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs @@ -5,10 +5,11 @@ namespace Server.Engines.Quests.Samurai { public class FierceDragon : BaseCreature { + public override string DefaultName => "a fierce dragon"; + [Constructible] public FierceDragon() : base( AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a fierce dragon"; Body = 103; BaseSoundID = 362; @@ -99,4 +100,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/Haochi.cs b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/Haochi.cs index 15ceea959..f25d9b138 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/Haochi.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/Haochi.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Samurai { public class Haochi : BaseQuester { + public override string DefaultName => "Daimyo Haochi"; + [Constructible] public Haochi() : base( "the Honorable Samurai Legend" ) { @@ -21,7 +23,6 @@ namespace Server.Engines.Quests.Samurai Female = false; Body = 0x190; - Name = "Daimyo Haochi"; } public override void InitOutfit() @@ -179,4 +180,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs index 3950665f9..3b45ed110 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs @@ -6,11 +6,12 @@ namespace Server.Engines.Quests.Samurai [CorpseName( "an injured wolf corpse" )] public class InjuredWolf : BaseCreature { + public override string DefaultName => "an injured wolf"; + [Constructible] public InjuredWolf() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { Body = 0xE1; - Name = "an injured wolf"; BaseSoundID = 0xE5; Hue = Utility.RandomAnimalHue(); @@ -56,4 +57,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/Relnia.cs b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/Relnia.cs index 63f1f9b4a..57a13baef 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/Relnia.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/Relnia.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Samurai { public class Relnia : BaseQuester { + public override string DefaultName => "Disheveled Relnia"; + [Constructible] public Relnia() : base( "the Gypsy" ) { @@ -21,7 +23,6 @@ namespace Server.Engines.Quests.Samurai Female = true; Body = 0x191; - Name = "Disheveled Relnia"; } public override void InitOutfit() @@ -93,4 +94,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs index e74513276..093b2b4bd 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Samurai [CorpseName( "a young ninja's corpse" )] public class YoungNinja : BaseCreature { + public override string DefaultName => "a young ninja"; + [Constructible] public YoungNinja() : base( AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { @@ -16,7 +18,6 @@ namespace Server.Engines.Quests.Samurai Hue = Utility.RandomSkinHue(); Body = 0x190; - Name = "a young ninja"; Utility.AssignRandomHair( this ); Utility.AssignRandomFacialHair( this ); @@ -39,7 +40,7 @@ namespace Server.Engines.Quests.Samurai SetSkill( SkillName.Tactics, 50.0 ); } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public YoungNinja( Serial serial ) : base( serial ) { @@ -59,4 +60,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs index f108b555d..901044446 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Samurai [CorpseName( "a young ronin's corpse" )] public class YoungRonin : BaseCreature { + public override string DefaultName => "a young ronin"; + [Constructible] public YoungRonin() : base( AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { @@ -16,7 +18,6 @@ namespace Server.Engines.Quests.Samurai Hue = Utility.RandomSkinHue(); Body = 0x190; - Name = "a young ronin"; Utility.AssignRandomHair( this ); Utility.AssignRandomFacialHair( this ); @@ -45,7 +46,7 @@ namespace Server.Engines.Quests.Samurai SetSkill( SkillName.Tactics, 50.0 ); } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public YoungRonin( Serial serial ) : base( serial ) { @@ -65,4 +66,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Solen Matriarch/Conversations.cs b/Scripts/Engines/Quests/Solen Matriarch/Conversations.cs index 25dde0627..e066c261c 100644 --- a/Scripts/Engines/Quests/Solen Matriarch/Conversations.cs +++ b/Scripts/Engines/Quests/Solen Matriarch/Conversations.cs @@ -14,7 +14,7 @@ namespace Server.Engines.Quests.Matriarch if ( m_Friend ) { /* The Solen Matriarch smiles as you greet her.

- * + * * It is good to see you again. I would offer to process some zoogi fungus for you, * but you seem to be busy with another task at the moment. Perhaps you should * finish whatever is occupying your attention at the moment and return to me once @@ -25,9 +25,9 @@ namespace Server.Engines.Quests.Matriarch else { /* The Solen Matriarch smiles as she eats the seed you offered.

- * + * * Thank you for that seed. It was quite delicious.

- * + * * I would offer to make you a friend of my colony, but you seem to be busy with * another task at the moment. Perhaps you should finish whatever is occupying * your attention at the moment and return to me once you're done. @@ -37,7 +37,7 @@ namespace Server.Engines.Quests.Matriarch } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DontOfferConversation( bool friend ) { @@ -70,10 +70,10 @@ namespace Server.Engines.Quests.Matriarch get { /* The Solen Matriarch looks pleased that you've accepted.

- * + * * Very good. Please start by hunting some infiltrators from the other solen * colony and eliminating them. Slay 7 of them and then return to me.

- * + * * Farewell for now and good hunting. */ return 1054084; @@ -97,17 +97,17 @@ namespace Server.Engines.Quests.Matriarch get { /* The Solen Matriarch looks up as you approach.

- * + * * You're back, but you have not yet eliminated 7 infiltrators from the enemy * colony. Return when you have completed this task.

- * + * * Carry on. I'll be waiting for your return. */ return 1054089; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DuringKillInfiltratorsConversation() { @@ -121,14 +121,14 @@ namespace Server.Engines.Quests.Matriarch get { /* The Solen Matriarch nods favorably as you approach her.

- * + * * Marvelous! I'm impressed at your ability to hunt and kill enemies for me. * My colony is thankful.

- * + * * Now I must ask that you gather some water for me. A standard pitcher of water * holds approximately one gallon. Please decant 8 gallons of fresh water * into our water vats.

- * + * * Farewell for now. */ return 1054091; @@ -152,17 +152,17 @@ namespace Server.Engines.Quests.Matriarch get { /* The Solen Matriarch looks up as you approach.

- * + * * You're back, but you have not yet gathered 8 gallons of water. Return when * you have completed this task.

- * + * * Carry on. I'll be waiting for your return. */ return 1054094; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DuringWaterGatheringConversation() { @@ -181,12 +181,12 @@ namespace Server.Engines.Quests.Matriarch { /* The Solen Matriarch listens as you report the completion of your * tasks to her.

- * + * * I give you my thanks for your help, and I will gladly process some zoogi * fungus into powder of translocation for you. Two of the zoogi fungi are * required for each measure of the powder. I will process up to 200 zoogi fungi * into 100 measures of powder of translocation.

- * + * * I will also give you some gold for assisting me and my colony, but first let's * take care of your zoogi fungus. */ @@ -196,15 +196,15 @@ namespace Server.Engines.Quests.Matriarch { /* The Solen Matriarch listens as you report the completion of your * tasks to her.

- * + * * I give you my thanks for your help, and I will gladly make you a friend of my * solen colony. My warriors, workers, and queens will not longer look at you * as an intruder and attack you when you enter our lair.

- * + * * I will also process some zoogi fungus into powder of translocation for you. * Two of the zoogi fungi are required for each measure of the powder. I will * process up to 200 zoogi fungi into 100 measures of powder of translocation.

- * + * * I will also give you some gold for assisting me and my colony, but first let's * take care of your zoogi fungus. */ @@ -249,7 +249,7 @@ namespace Server.Engines.Quests.Matriarch get { /* The Solen Matriarch smiles as you greet her.

- * + * * I will gladly process some zoogi fungus into powder of translocation for you. * Two of the zoogi fungi are required for each measure of the powder. * I will process up to 200 zoogi fungi into 100 measures of powder of translocation. @@ -258,7 +258,7 @@ namespace Server.Engines.Quests.Matriarch } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DuringFungiProcessConversation() { @@ -272,10 +272,10 @@ namespace Server.Engines.Quests.Matriarch get { /* The Solen Matriarch looks at you with a smile.

- * + * * While I'd like to finish conducting our business, it seems that you're a * bit overloaded with equipment at the moment.

- * + * * Perhaps you should free some room in your backpack before we proceed. */ return 1054102; @@ -284,7 +284,7 @@ namespace Server.Engines.Quests.Matriarch private bool m_Logged; - public override bool Logged{ get{ return m_Logged; } } + public override bool Logged => m_Logged; public FullBackpackConversation( bool logged ) { @@ -310,7 +310,7 @@ namespace Server.Engines.Quests.Matriarch get { /* The Solen Matriarch smiles as you greet her.

- * + * * Ah good, you've returned. I will conclude our business by giving you * gold I owe you for aiding me. */ @@ -327,4 +327,4 @@ namespace Server.Engines.Quests.Matriarch System.Complete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs b/Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs index d821459d5..c5d7ec1c9 100644 --- a/Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs +++ b/Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs @@ -14,13 +14,11 @@ namespace Server.Engines.Quests.Matriarch public abstract class BaseSolenMatriarch : BaseQuester { public abstract bool RedSolen{ get; } - - public override bool DisallowAllMoves{ get{ return false; } } + public override string DefaultName => "the solen matriarch"; + public override bool DisallowAllMoves => false; public BaseSolenMatriarch() { - Name = "the solen matriarch"; - Body = 0x328; if ( !RedSolen ) @@ -283,7 +281,7 @@ namespace Server.Engines.Quests.Matriarch public class RedSolenMatriarch : BaseSolenMatriarch { - public override bool RedSolen{ get{ return true; } } + public override bool RedSolen => true; [Constructible] public RedSolenMatriarch() @@ -311,7 +309,7 @@ namespace Server.Engines.Quests.Matriarch public class BlackSolenMatriarch : BaseSolenMatriarch { - public override bool RedSolen{ get{ return false; } } + public override bool RedSolen => false; [Constructible] public BlackSolenMatriarch() @@ -336,4 +334,4 @@ namespace Server.Engines.Quests.Matriarch int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs b/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs index d87514658..a7c4d4b1e 100644 --- a/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs +++ b/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs @@ -44,21 +44,21 @@ namespace Server.Engines.Quests.Matriarch if ( IsFriend( From, RedSolen ) ) { /* The Solen Matriarch smiles happily as you greet her.

- * + * * Hello again. It is always good to see a friend of our colony.

- * + * * Would you like me to process some zoogi fungus into powder of translocation * for you? I would be happy to do so if you will first undertake a couple * tasks for me.

- * + * * First, I would like for you to eliminate some infiltrators from the other * solen colony. They are spying on my colony, and I fear for the safety of my * people. They must be slain.

- * + * * After that, I must ask that you gather some water for me. Our water supplies * are inadequate, so we must try to supplement our reserve using water vats here * in our lair.

- * + * * Will you accept my offer? */ return 1054083; @@ -66,26 +66,26 @@ namespace Server.Engines.Quests.Matriarch else { /* The Solen Matriarch smiles happily as she eats the seed you offered.

- * + * * I think you for that seed. I was quite delicious. So full of flavor.

- * + * * Hmm... if you would like, I could make you a friend of my colony. This would stop * the warriors, workers, and queens of my colony from thinking you are an intruder, * thus they would not attack you. In addition, as a friend of my colony I will process * zoogi fungus into powder of translocation for you.

- * + * * To become a friend of my colony, I ask that you complete a couple tasks for me. These * are the same tasks I will ask of you when you wish me to process zoogi fungus, * by the way.

- * + * * First, I would like for you to eliminate some infiltrators from the other solen colony. * They are spying on my colony, and I fear for the safety of my people. They must * be slain.

- * + * * After that, I must ask that you gather some water for me. Our water supplies are * inadequate, so we must try to supplement our reserve using water vats here in our * lair.

- * + * * Will you accept my offer? */ return 1054082; @@ -94,7 +94,7 @@ namespace Server.Engines.Quests.Matriarch } public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } - public override bool IsTutorial{ get{ return false; } } + public override bool IsTutorial => false; public override int Picture{ get{ return 0x15C9; } } @@ -157,4 +157,4 @@ namespace Server.Engines.Quests.Matriarch } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Study of the Solen Hive/Conversations.cs b/Scripts/Engines/Quests/Study of the Solen Hive/Conversations.cs index ae569c95d..7666a7ed8 100644 --- a/Scripts/Engines/Quests/Study of the Solen Hive/Conversations.cs +++ b/Scripts/Engines/Quests/Study of the Solen Hive/Conversations.cs @@ -10,12 +10,12 @@ namespace Server.Engines.Quests.Naturalist get { /* The Naturalist looks up from his scribbled notes.

- * + * * Greetings!

- * + * * If you're interested in helping out a scholar of some repute, I do have some * work that I could use some assistance with.

- * + * * You seem a little preoccupied with another task right now, however. Perhaps * you should finish whatever it is that has your attention at the moment and * return to me once you're done. @@ -24,7 +24,7 @@ namespace Server.Engines.Quests.Naturalist } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DontOfferConversation() { @@ -43,7 +43,7 @@ namespace Server.Engines.Quests.Naturalist * certain that Terathans had the ability to change their shape to resemble * various fruits and vegetables - a point on which I am certain further * study of the beasts will prove correct.

- * + * * In any case, I cannot thank you enough! Please return to me when you have * studied all the Solen Egg Nests hidden within the Solen Hive. */ @@ -69,15 +69,15 @@ namespace Server.Engines.Quests.Naturalist { /* The Naturalist looks up from his notes with a frustrated look * on his face.

- * + * * Haven't you finished the task I appointed you yet? Gah! It's so * difficult to find a good apprentice these days.

- * + * * Remember, you must first find an entrance to the Solen Hive. Once inside, * I need you to examine the Solen Egg Nests for me. When you have studied * all four nests, you should have enough information to earn yourself a * reward.

- * + * * Now go on, away with you! I have piles of notes from other more helpful * apprentices that I still need to study! */ @@ -85,7 +85,7 @@ namespace Server.Engines.Quests.Naturalist } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public NaturalistDuringStudyConversation() { @@ -100,21 +100,21 @@ namespace Server.Engines.Quests.Naturalist { /* The Naturalist looks up from his notes with a pleased expression * on his face.

- * + * * Ah! Thank you, my goodly apprentice! These notes you have gathered will * no doubt assist me in my understanding of these fascinating Solen creatures.

- * + * * Now, since you've done such a fine job, I feel that I should give you a little * reward.

- * + * * I have a botanist friend who has discovered a strange mutation in the plants * she has grown. Through science and sorcery, she has managed to produce a mutant * strain of colored seeds the like of which no gardener has laid eyes upon.

- * + * * As a reward for your fine efforts, I present you with this strange rare seed. * Which reminds me, I still need to compile my notes on Solen dietary habits. They * are voracious seed eaters, those Solen Matriarchs!

- * + * * In any case, I must get back to my notes now. I give you my thanks once more, * and bid a good day to you my little apprentice! If you wish to help me out again, * just say the word. @@ -141,27 +141,27 @@ namespace Server.Engines.Quests.Naturalist { /* The Naturalist looks up from his notes with an ecstatic look upon * his face.

- * + * * Oh my! These notes you've brought me - they say you have information on the * Secret Solen Egg Nest? I've heard many tales of this secret store of special * Solen Eggs, but there are many missing gaps in my notes concerning it.

- * + * * The notes you've made here will most certainly advance my understanding of * this mysterious breed of creatures!

- * + * * Considering the amazing effort you put into your work, I feel as if I should * give you something extra special as a bonus. Hrmm...

- * + * * I have a botanist friend who has discovered a strange mutation in the plants * she has grown. Through science and sorcery, she has managed to produce a rare * mutant strain of colored seeds the like of which no gardener has laid * eyes upon.

- * + * * I've given a few of her seeds out to various apprentices - but I usually keep * her very rare stock all for myself. They're quite amazing looking! However, * since you've done such a fine job for me, I'll present you with one of * these rare fire-red seeds.

- * + * * Once again, my thanks to you! Now I really must get back to studying these notes! * Take care, my fine apprentice, and come back if you wish to help me further! */ @@ -186,7 +186,7 @@ namespace Server.Engines.Quests.Naturalist get { /* The Naturalist looks at you with a friendly expression.

- * + * * I see you've returned with information for me. While I'd like to finish * conducting our business, it seems that you're a bit overloaded with * equipment at the moment. Perhaps you'd better free up some room before @@ -196,10 +196,10 @@ namespace Server.Engines.Quests.Naturalist } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public FullBackpackConversation() { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs b/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs index f8f3ca00a..ad36cd7ca 100644 --- a/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs +++ b/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs @@ -35,22 +35,22 @@ namespace Server.Engines.Quests.Naturalist { /* The Naturalist looks up from his notes, regarding you with a hopeful * look in his eyes.

- * + * * Um..yes..excuse me. I was wondering if you could offer me a bit of assistance. * You see, I'm a naturalist of some repute - a gentleman and a scholar if you * will - primarily interested in the study of insects and arachnids. While I've * written a few interesting books on the marvelous Terathan race and their bizarre * culture, now I've heard tales of a truly significant new discovery!

- * + * * Apparently a race of ant-like creatures known as the Solen have appeared in * our world, scuttling up from some previously hidden home. Can you believe it? * Truly these are amazing times! To a scholar such as myself this is indeed * an exciting opportunity.

- * + * * That said, while I may be a genius of some reknown, sharp as a tack and quick * with the quill, I'm afraid I'm not much of the adventuring type. Though I have * gained assistance before, I still have many unanswered questions.

- * + * * I am particularly interested in the Solen Egg Nests that are studiously * protected by the Solen workers. If you would be so kind as to assist me, * I would ask that you travel into the Solen Hive and inspect each of the @@ -58,7 +58,7 @@ namespace Server.Engines.Quests.Naturalist * each Nest before you have gathered enough information. Once you are done, * report back to me and I will reward you as best as I can for your valiant * efforts!

- * + * * Will you accept my offer? */ return 1054042; @@ -66,7 +66,7 @@ namespace Server.Engines.Quests.Naturalist } public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } - public override bool IsTutorial{ get{ return false; } } + public override bool IsTutorial => false; public override int Picture{ get{ return 0x15C7; } } @@ -108,4 +108,4 @@ namespace Server.Engines.Quests.Naturalist AddConversation( new AcceptConversation() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Terrible Hatchlings/Conversations.cs b/Scripts/Engines/Quests/Terrible Hatchlings/Conversations.cs index 2946ae670..f662cf7a2 100644 --- a/Scripts/Engines/Quests/Terrible Hatchlings/Conversations.cs +++ b/Scripts/Engines/Quests/Terrible Hatchlings/Conversations.cs @@ -12,21 +12,21 @@ namespace Server.Engines.Quests.Zento get { /* Important Quest Information

- * + * * During your quest, any important information that a * NPC gives you, will appear in a window * such as this one. You can review the information at any time during your * quest.

- * + * * Getting Help

- * + * * Some of the text you will come across during your quest, * will be underlined links to the codex of wisdom, * or online help system. You can click on the text to get detailed information * on the underlined subject. You may also access the Codex Of Wisdom by * pressing "F1" or by clicking on the "?" on the toolbar at the top of * your screen.

Context Menus

- * + * * Context menus can be called up by single left-clicking (or Shift + single * left-click, if you changed it) on most objects or NPCs in the world. * Nearly everything, including your own avatar will have context menus available. @@ -58,7 +58,7 @@ namespace Server.Engines.Quests.Zento } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DirectionConversation() { @@ -76,7 +76,7 @@ namespace Server.Engines.Quests.Zento } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public TakeCareConversation() { @@ -92,7 +92,7 @@ namespace Server.Engines.Quests.Zento /* Thank you for helping me get rid of these vile beasts! * You have been rewarded for your good deeds. If you wish to * help me in the future, visit me again.

- * + * * Farewell. */ return 1063321; @@ -108,4 +108,4 @@ namespace Server.Engines.Quests.Zento System.Complete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Terrible Hatchlings/Mobiles/AnsellaGryen.cs b/Scripts/Engines/Quests/Terrible Hatchlings/Mobiles/AnsellaGryen.cs index 5c45c6b49..8dc06f0ec 100644 --- a/Scripts/Engines/Quests/Terrible Hatchlings/Mobiles/AnsellaGryen.cs +++ b/Scripts/Engines/Quests/Terrible Hatchlings/Mobiles/AnsellaGryen.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Zento { public class AnsellaGryen : BaseQuester { + public override string DefaultName => "Ansella Gryen"; + [Constructible] public AnsellaGryen() { @@ -21,7 +23,6 @@ namespace Server.Engines.Quests.Zento Female = true; Body = 0x191; - Name = "Ansella Gryen"; } public override void InitOutfit() @@ -143,4 +144,4 @@ namespace Server.Engines.Quests.Zento public override void TurnToTokuno() { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs b/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs index ed818a8ae..fa2ad5d84 100644 --- a/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs +++ b/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs @@ -39,7 +39,7 @@ namespace Server.Engines.Quests.Zento * hatchlings. If you kill 10 of them, you will be rewarded. * The Deathwatch Beetle Hatchlings live in The Waste - * the desert close to this city.

- * + * * Will you accept this challenge? */ return 1063315; @@ -47,7 +47,7 @@ namespace Server.Engines.Quests.Zento } public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } - public override bool IsTutorial{ get{ return true; } } + public override bool IsTutorial => true; public override int Picture{ get{ return 0x15CF; } } @@ -67,4 +67,4 @@ namespace Server.Engines.Quests.Zento AddConversation( new AcceptConversation() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs b/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs index df1e27056..632f8931b 100644 --- a/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs +++ b/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs @@ -14,6 +14,8 @@ namespace Server.Engines.Quests.Doom { public class Chyloth : BaseQuester { + public override string DefaultName => "Chyloth"; + [Constructible] public Chyloth() : base( "the Ferryman" ) { @@ -29,8 +31,6 @@ namespace Server.Engines.Quests.Doom Hue = 0x8455; Body = 0x190; - - Name = "Chyloth"; } public override void InitOutfit() @@ -320,4 +320,4 @@ namespace Server.Engines.Quests.Doom } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs b/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs index 6e0a226af..d43e35e89 100644 --- a/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs +++ b/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs @@ -13,9 +13,10 @@ namespace Server.Engines.Quests.Doom public class Victoria : BaseQuester { public override int TalkNumber{ get{ return 6159; } } // Ask about Chyloth - public override bool ClickTitle{ get{ return true; } } - public override bool IsActiveVendor{ get{ return true; } } - public override bool DisallowAllMoves{ get{ return false; } } + public override string DefaultName => "Victoria"; + public override bool ClickTitle => true; + public override bool IsActiveVendor => true; + public override bool DisallowAllMoves => false; public override void InitSBInfo() { @@ -38,8 +39,6 @@ namespace Server.Engines.Quests.Doom Female = true; Hue = 0x8835; Body = 0x191; - - Name = "Victoria"; } private SummoningAltar m_Altar; @@ -161,4 +160,4 @@ namespace Server.Engines.Quests.Doom int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs b/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs index b92b967ff..211f3e583 100644 --- a/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs +++ b/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs @@ -45,35 +45,35 @@ namespace Server.Engines.Quests.Doom get { /* Victoria turns to you and smiles...

- * + * * Chyloth, eh? He is the ferry man of lake Mortis, beyond which lies * the nest of the The Dark Father - the fountainhead of all the evil * that you see around you here.

- * + * * 800 and some years ago, my sisters and I persuaded the ferry man Chyloth * to take us across the lake to battle the The Dark Father. * My party was utterly destroyed, except for me. For my insolence, I was * cursed by the The Dark Father to wander these halls for eternity, * unable to die - unable to leave.

- * + * * Chyloth usually only crosses over the souls of the undead, but he can be * persuaded otherwise...with a token of gold, in the form of a human skull. * Such a gem can be found only in the belly of the hellspawn known as * the devourer.

- * + * * I can help you summon the beast from the depths of the abyss, but I require * 1000 Daemon bones to do so. If you accept my help, I will store the Daemon * bones for you until you have collected all 1000 of them. Once the bones * are collected in full, I will summon the beast for you, which you must * slay to claim your prize.

- * + * * Do you accept? */ return 1050020; } } - public override bool IsTutorial{ get{ return false; } } + public override bool IsTutorial => false; public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } public override int Picture{ get{ return 0x15B5; } } @@ -160,4 +160,4 @@ namespace Server.Engines.Quests.Doom writer.Write( (bool) m_WaitForSummon ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs index a62e8cabd..cfe4604e3 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs @@ -10,23 +10,23 @@ namespace Server.Engines.Quests.Haven get { /* Important Quest Information

- * + * * During your quest, any important information that a * NPC gives you, will appear * in a window such as this one. You can review the information * at any time during your quest.

- * + * * Getting Help

- * + * * Some of the text you will come across during your quest, * will be underlined links to the codex of wisdom, * or online help system. You can click on the text to get detailed * information on the underlined subject. You may also access the * Codex Of Wisdom by pressing "F1" or by clicking on the "?" on the toolbar * at the top of your screen.

- * + * * Context Menus

- * + * * Context menus can be called up by single left-clicking * (or Shift + single left-click, if you changed it) on most objects * or NPCs in the world. Nearly everything, including your own avatar @@ -55,43 +55,43 @@ namespace Server.Engines.Quests.Haven get { /* Uzeraan greets you as you approach...

- * + * * Greetings traveler!

- * + * * I am Uzeraan, the lord of this house and overseer of this fine city, Haven. * I know we have just met, but time is short and we need to reinforce * the troops in the mountain pass, so I will not waste your time * with pleasantries.

- * + * * We have been trying to fight back the wicked Horde Minions which * have recently begun attacking our cities - but to no avail. * We desperately need help!

- * + * * Your first task will be to assess the situation in the mountain pass, * and help our troops defeat the Horde Minions there.

- * + * * Before I send you into battle however, it is time that I teach you a thing * or two about the way of the Paladin.

- * + * * The Paladin

- * + * * Paladins are the holy warriors of the realm who have dedicated themselves * as protectors of the virtues and vanquishers of all that is evil.

- * + * * Paladins have several special abilities that * are not available to the ordinary warrior. Due to the spiritual nature of * these abilities, the Paladin requires some amount of mana to activate them. * In addition to mana, the Paladin is also required to spend a certain amount * of tithing points each time a special ability * is used.

- * + * * Tithing points and mana are automatically consumed when a special Paladin * ability is activated. All Paladin abilities are activated through the * Book of Chivalry

- * + * * Go now, to the shrine just East of here, just before the doors and * tithe at least 500 gold.

- * + * * Return here when you are done. */ return 1060209; @@ -117,29 +117,29 @@ namespace Server.Engines.Quests.Haven if ( System.From.Profession == 1 ) // warrior { /* Uzeraan greets you as you approach...

- * + * * Greetings traveler!

- * + * * I am Uzeraan, the lord of this house and overseer of this fine city, Haven. * I know we have just met, but time is short and we need to reinforce the troops * in the mountain pass, so I will not waste your time with pleasantries.

- * + * * We have been trying to fight back the wicked Horde Minions which have * recently begun attacking our cities - but to no avail. We desperately need * help!

- * + * * Your first task will be to assess the situation in the mountain pass, and * help our troops defeat the Horde Minions there.

- * + * * Take the road marked with glowing runes, that starts just outside of this * mansion. Before you go into battle, it would be prudent to * review combat techniques as well as * information on healing yourself.

- * + * * To aid you in your fight, you may also wish to * purchase equipment from Frank the Blacksmith, * who is standing just South of here.

- * + * * Good luck young warrior. */ return 1049088; @@ -147,30 +147,30 @@ namespace Server.Engines.Quests.Haven else if ( System.From.Profession == 2 ) // magician { /* Uzeraan greets you as you approach...

- * + * * Greetings traveler!

- * + * * I am Uzeraan, the lord of this house and overseer of this fine city, Haven. * I know we have just met, but time is short and we need to reinforce * the troops in the mountain pass, so I will not waste your time with * pleasantries.

- * + * * We have been trying to fight back the wicked Horde Minions which have * recently begun attacking our cities - but to no avail. We desperately * need help!

- * + * * Your first task will be to assess the situation in the mountain pass, * and help our troops defeat the Horde Minions there.

- * + * * Take the road marked with glowing runes, that starts just outside of this * mansion. Before you go into battle, it would be prudent to * review your magic skills as well as * information on healing yourself.

- * + * * To aid you in your fight, you may also wish to * purchase equipment from Frank the Blacksmith, * who is standing just South of here.

- * + * * Good luck young mage. */ return 1049386; @@ -178,26 +178,26 @@ namespace Server.Engines.Quests.Haven else { /* Uzeraan nods at you with approval and begins to speak...

- * + * * Now that you are ready, let me give you your first task.

- * + * * As I mentioned earlier, we have been trying to fight back the wicked * Horde Minions which have recently begun attacking our cities * - but to no avail. Our need is great!

- * + * * Your first task will be to assess the situation in the mountain pass, * and help our troops defeat the Horde Minions there.

- * + * * Take the road marked with glowing runes, that starts just outside of this mansion. * Before you go into battle, it would be prudent to * review combat techniques as well as * information on healing yourself, * using your Paladin ability 'Close Wounds'.

- * + * * To aid you in your fight, you may also wish to * purchase equipment from Frank the Blacksmith, * who is standing just South of here.

- * + * * Good luck young Paladin! */ return 1060388; @@ -232,31 +232,31 @@ namespace Server.Engines.Quests.Haven { /* You give your report to Uzeraan and after a while, he begins to * speak...

- * + * * Your report is grim, but all hope is not lost! It has become apparent * that our swords and spells will not drive the evil from Haven.

- * + * * The head of my order, the High Mage Schmendrick, arrived here shortly after * you went into battle with the Horde Minions. He has brought with him a * scroll of great power, that should aid us greatly in our battle.

- * + * * Unfortunately, the entrance to one of our mining caves collapsed recently, * trapping our miners inside.

- * + * * Schmendrick went to install magical teleporters inside the mines so that * the miners would have a way out. The miners have since returned, but Schmendrick has not. * Those who have returned, all seem to have lost their minds to madness; * mumbling strange things of "the souls of the dead seeking revenge".

- * + * * No matter. We must find Schmendrick.

- * + * * Step onto the teleporter, located against the wall, and seek Schmendrick in the mines.

- * + * * I've given you a bag with some Travel Spells, * in case you need to make a quick escape. In addition, you may wish to cast * the Night Sight spell on yourself before going * into the cave, as it it's pretty dark in there.

- * + * * Now please go. Good luck, friend. */ return 1049387; @@ -265,26 +265,26 @@ namespace Server.Engines.Quests.Haven { /* You give your report to Uzeraan and after a while, * he begins to speak...

- * + * * Your report is grim, but all hope is not lost! It has become apparent * that our swords and spells will not drive the evil from Haven.

- * + * * The head of my order, the High Mage Schmendrick, arrived here shortly after * you went into battle with the Horde Minions. He has brought with him a * scroll of great power, that should aid us greatly in our battle.

- * + * * Unfortunately, the entrance to one of our mining caves collapsed recently, * trapping our miners inside.

- * + * * Schmendrick went to install magical teleporters inside the mines so that * the miners would have a way out. The miners have since returned, but Schmendrick has not. * Those who have returned, all seem to have lost their minds to madness; * mumbling strange things of "the souls of the dead seeking revenge".

- * + * * No matter. We must find Schmendrick.

- * + * * Step onto the teleporter, located against the wall, and seek Schmendrick in the mines.

- * + * * I've given you a bag with some Night Sight * and Healing potions * to help you out along the way. Good luck. @@ -324,25 +324,25 @@ namespace Server.Engines.Quests.Haven * His mind seems to be occupied with something else. You explain to him that * you came for the scroll of power and after a long while he begins to speak, * but apparently still not giving you his full attention...

- * + * * Hmmm.. peculiar indeed. Very strange activity here indeed... I wonder...

- * + * * Hmmm. Oh yes! Scroll, you say? I don't have it, sorry. My apprentice * was carrying it, and he ran off to somewhere in this cave. Find him and * you will find the scroll.

- * + * * Be sure to bring the scroll to Uzeraan once you have it. He's the only person * aside from myself who can read the ancient markings on the scroll. * I need to figure out what's going on down here before I can leave. * Strange activity indeed...

- * + * * One more thing...

- * + * * Be careful of the restless souls wandering about. They seem to be in the habit * of spontaneously attacking people. Perhaps using your paladin ability * Enemy of One might help you overcome the perils * of these halls.

- * + * * Schmendrick goes back to his work and you seem to completely fade from his awareness... */ return 1060749; @@ -353,16 +353,16 @@ namespace Server.Engines.Quests.Haven * mind seems to be occupied with something else. You explain to him that * you came for the scroll of power and after a long while he begins to speak, * but apparently still not giving you his full attention...

- * + * * Hmmm.. peculiar indeed. Very strange activity here indeed... I wonder...

- * + * * Hmmm. Oh yes! Scroll, you say? I don't have it, sorry. My apprentice was * carrying it, and he ran off to somewhere in this cave. Find him and you will * find the scroll.

Be sure to bring the scroll to Uzeraan once you * have it. He's the only person aside from myself who can read the ancient * markings on the scroll. I need to figure out what's going on down here before * I can leave. Strange activity indeed...

- * + * * Schmendrick goes back to his work and you seem to completely fade from his * awareness... */ @@ -396,35 +396,35 @@ namespace Server.Engines.Quests.Haven { /* Uzeraan carefully unravels the scroll and begins to read... * after a short while his face lights up with a smile and he speaks to you...

- * + * * This is wonderful, friend! For your troubles I've given you a treasure map * I had laying about, along with a shovel to dig up the treasure. * Feel free to find the treasure at your leisure.

- * + * * Now let us get back to the business of this scroll. The only trouble, * is that this scroll calls for some special ingredients that I do * not have on hand.

- * + * * Though it may involve some danger, I will ask of you to find * these reagents for me.

- * + * * There are three reagents I need to complete the spell.

- * + * * The first thing I need is some Fertile Dirt.

- * + * * There lives a Dryad on this island who I know would have such a thing on hand. * I have recalibrated the teleporter to transport you to the Dryad's grove, * which lies South-West of this mansion.

- * + * * Tell her Uzeraan sent you, and she should cooperate.

- * + * * Should you get into trouble out there or should you lose your way, do not worry. * I have also given you a magical horn - a Horn of Retreat. * Play the horn at any time to open a magical gateway that leads back to this mansion.

- * + * * Should your horn run out of charges, * simply hand me or any of my mansion guards the horn to have it recharged.

- * + * * Good luck friend. */ return 1049325; @@ -460,14 +460,14 @@ namespace Server.Engines.Quests.Haven * uneasy feeling in the pit of your stomach. You explain that * Uzeraan has sent you for a quantity of fertile dirt. With a wide grin * and in a slightly hoarse voice she replies...

- * + * * Fertile Dirt, eh? Well, I have a few patches here...but what have * you brought me in return? Came empty-handed did you? That's unfortunate * indeed... but since you were sent by my dear friend Uzeraan, I supposed * I could oblige you.

- * + * * The Dryad digs around in the ground and hands you a patch of Fertile Dirt.

- * + * * With a smile she goes back to her work... */ return 1049326; @@ -493,12 +493,12 @@ namespace Server.Engines.Quests.Haven if ( System.From.Profession == 2 ) // magician { /* Uzeraan takes the dirt from you and smiles...

 - * + * * Wonderful! I knew I could count on you. As a token of my appreciation * I've given you a bag with some reagents * as well as some spell scrolls. They should * help out a bit.

- * + * * The next item I need is a Vial of Blood. I know it seems strange, * but that's what the formula asks for. I have some locked away in a chest * not far from here. It's only a short distance from the mansion. Let me @@ -508,7 +508,7 @@ namespace Server.Engines.Quests.Haven * stairs and through the door. Inside you will find a chest. Open it and * bring me a Vial of Blood from inside the chest. It's very easy to find. * Just follow the road and you can't miss it.

- * + * * Good luck! */ return 1049388; @@ -516,23 +516,23 @@ namespace Server.Engines.Quests.Haven else { /* Uzeraan takes the dirt from you and smiles...

 - * + * * Wonderful! I knew I could count on you. As a token of my appreciation * I've given you a bag with some bandages as well as some healing potions. * They should help out a bit.

- * + * * The next item I need is a Vial of Blood. I know it seems strange, * but that's what the formula asks for. I have some locked away in a chest * not far from here. It's only a short distance from the mansion. Let me give * you directions...

- * + * * Exit the front door to the East. Then follow the path to the North. * You will pass by several pedestals with lanterns on them. Continue on this * path until you run into a small hut. Walk up the stairs and through the door. * Inside you will find a chest. Open it and bring me a Vial of Blood * from inside the chest. It's very easy to find. Just follow the road and you * can't miss it.

- * + * * Good luck! */ return 1049329; @@ -587,20 +587,20 @@ namespace Server.Engines.Quests.Haven else { /* You hand Uzeraan the Vial of Blood, which he hastily accepts...

- * + * * Excellent work! Only one reagent remains and the spell is complete! * The final requirement is a Daemon Bone, which will not be as easily * acquired as the previous two components.

- * + * * There is a haunted graveyard on this island, which is the home to many * undead creatures. Dispose of the undead as you see fit. Be sure to search * their remains after you have smitten them, to check for a Daemon Bone. * I'm quite sure that you will find what we seek, if you are thorough enough * with your extermination.

- * + * * Take this magical silver sword to aid you in your battle. Silver weapons * will damage the undead twice as much as your regular weapon.

- * + * * Return here when you have found a Daemon Bone. */ return 1049333; @@ -648,23 +648,23 @@ namespace Server.Engines.Quests.Haven { /* As you hand Uzeraan the final reagent, he nods at you with approval * and starts searching through the pockets of his robe...

- * + * * After a short while he hands you a small pouch...

- * + * * There you are. Your contract of employment with me has expired and so here * is your pay. 2000 gold in the form of a check and a magical sextant that * will help you find Moongates and Banks.

- * + * * Before you can actually spend the money I have given you, however, you must * cash the check.

- * + * * I have recalibrated the teleporter to take you to the Haven * Bank. Step onto the teleporter to be taken * to the bank, which lies South-East of here.

- * + * * Thank you for all your help friend. I hope we shall meet * each other again in the future.

- * + * * Farewell. */ return 1049335; @@ -688,18 +688,18 @@ namespace Server.Engines.Quests.Haven get { /* The banker smiles at you and greets you in a loud and robust voice...

- * + * * Well hello there adventurer! I see you've learned how to cash checks. Wonderful! * Let me tell you a bit about the banks in this world...

- * + * * Anything that you place into any bank box, can be retrieved from any other * bank box in the land. For instance, if you place an item into a bank box in * Britain, it can be retrieved from your bank box in Moonglow or any other city.

- * + * * Bank boxes are very secure. So secure, in fact, that no one can ever get into * your bank box except for yourself. Security is hard to come by these days, * but you can trust in the banking system of Britannia! We shall not let you down!

- * + * * I hope to be seeing much more of you as your riches grow! May your bank box overflow * with the spoils of your adventures.

Farewell adventurer, you are now free to * explore the world on your own. @@ -725,10 +725,10 @@ namespace Server.Engines.Quests.Haven get { /* If you are leaving the mansion, you should learn about the Radar Map.

- * + * * The Radar Map (or Overhead View) can be opened by pressing 'ALT-R' on your * keyboard. It shows your immediate surroundings from a bird's eye view.

- * + * * Pressing ALT-R twice, will enlarge the Radar Map a little. Use the Radar Map * often as you travel throughout the world to familiarize yourself with your surroundings. */ @@ -736,7 +736,7 @@ namespace Server.Engines.Quests.Haven } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public RadarConversation() { @@ -754,7 +754,7 @@ namespace Server.Engines.Quests.Haven if ( m_FromUzeraan ) { /* You return without the scroll???

- * + * * All hope is lost without it, friend. Return to the mines and talk to * Schmendrick to see if he can help us out of this predicament. */ @@ -766,9 +766,9 @@ namespace Server.Engines.Quests.Haven * the scroll from memory. Bring me a blank scroll, which you can * purchase from the mage shop just * East of Uzeraan's mansion in Haven.

- * + * * Return the scroll to me and I will try to make another scroll for you.

- * + * * When you return, be sure to hand me the scroll (drag and drop). */ return 1049345; @@ -776,7 +776,7 @@ namespace Server.Engines.Quests.Haven } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public LostScrollOfPowerConversation( bool fromUzeraan ) { @@ -814,7 +814,7 @@ namespace Server.Engines.Quests.Haven { /* You return without Fertile Dirt? It is imperative that we * get all of the ingredients friend.

- * + * * Seek out the Dryad and ask her to help you again. */ return 1049374; @@ -822,20 +822,20 @@ namespace Server.Engines.Quests.Haven else { /* You've lost the dirt I gave you?

- * + * * My, my, my... What ever shall we do now?

- * + * * I can try to make you some more, but I will need something * that I can transform. Bring me an apple, and I shall * see what I can do.

- * + * * You can buy apples from the * Provisioner's Shop, which is located a ways East * of Uzeraan's mansion.

- * + * * Hand me the apple when you have it, and I shall see about transforming * it for you.

- * + * * Good luck.

*/ return 1049359; @@ -843,7 +843,7 @@ namespace Server.Engines.Quests.Haven } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public LostFertileDirtConversation( bool fromUzeraan ) { @@ -877,17 +877,17 @@ namespace Server.Engines.Quests.Haven { /* The Dryad sticks the apple into the ground and you watch it * rot before your eyes.

- * + * * She pulls the now fertile dirt out of the ground and hands * it to you.

- * + * * There you go friend. Try not to lose it again this time, eh? */ return 1049360; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DryadAppleConversation() { @@ -902,14 +902,14 @@ namespace Server.Engines.Quests.Haven { /* You return without a Vial of Blood? It is imperative that we * get all of the ingredients friend.

- * + * * Go back to the chest and fetch another vial. Please hurry. */ return 1049375; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public LostDaemonBloodConversation() { @@ -924,7 +924,7 @@ namespace Server.Engines.Quests.Haven { /* You return without a Daemon Bone? It is imperative that we * get all of the ingredients friend.

- * + * * Go back to the graveyard and continue hunting the undead until you * find another one. Please hurry. */ @@ -932,7 +932,7 @@ namespace Server.Engines.Quests.Haven } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public LostDaemonBoneConversation() { @@ -947,24 +947,24 @@ namespace Server.Engines.Quests.Haven { /* I don't feel comfortable sending you into a potentially dangerous situation * with as few reagents as you have in your pack.

- * + * * Before going on, please acquire at least 30 of each reagent. You can * purchase reagents from the Mage shop, which is * located just East this mansion.

- * + * * Remember that there are eight (8) different reagents: Black Pearl, Mandrake Root, * Sulfurous Ash, Garlic, Ginseng, Blood Moss, Nightshade and Spider's Silk.

- * + * * Come back here when you are ready to go. */ return 1049390; } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public FewReagentsConversation() { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs index 04d5a21f4..d9448852b 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs @@ -10,10 +10,11 @@ namespace Server.Engines.Quests.Haven { public class Dryad : BaseQuester { - public override bool IsActiveVendor{ get{ return true; } } - public override bool DisallowAllMoves{ get{ return false; } } + public override bool IsActiveVendor => true; + public override bool DisallowAllMoves => false; public override bool ClickTitle{ get { return true; } } - public override bool CanTeach{ get{ return true; } } + public override bool CanTeach => true; + public override string DefaultName => "Anwin Brenna"; [Constructible] public Dryad() : base( "the Dryad" ) @@ -39,7 +40,6 @@ namespace Server.Engines.Quests.Haven Female = true; Body = 0x191; - Name = "Anwin Brenna"; } public override void InitOutfit() @@ -180,7 +180,7 @@ namespace Server.Engines.Quests.Haven Add( new GenericBuyInfo( typeof( Garlic ), 3, 20, 0xF84, 0 ) ); Add( new GenericBuyInfo( typeof( Bloodmoss ), 5, 20, 0xF7B, 0 ) ); Add( new GenericBuyInfo( typeof( Nightshade ), 3, 20, 0xF88, 0 ) ); - Add( new GenericBuyInfo( typeof( SpidersSilk ), 3, 20, 0xF8D, 0 ) ); + Add( new GenericBuyInfo( typeof( SpidersSilk ), 3, 20, 0xF8D, 0 ) ); Add( new GenericBuyInfo( typeof( MandrakeRoot ), 3, 20, 0xF86, 0 ) ); } } @@ -194,9 +194,9 @@ namespace Server.Engines.Quests.Haven Add( typeof( Ginseng ), 2 ); Add( typeof( Bloodmoss ), 3 ); Add( typeof( Nightshade ), 2 ); - Add( typeof( SpidersSilk ), 2 ); + Add( typeof( SpidersSilk ), 2 ); Add( typeof( MandrakeRoot ), 2 ); } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs index 965ec2627..893ea18a6 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs @@ -55,7 +55,7 @@ namespace Server.Engines.Quests.Haven SetSkill( SkillName.Swords, 20.0 ); } - public override bool ClickTitle { get { return false; } } + public override bool ClickTitle => false; public override bool IsEnemy( Mobile m ) { @@ -148,4 +148,4 @@ namespace Server.Engines.Quests.Haven int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Schmendrick.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Schmendrick.cs index ac09728f5..7d6b01886 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Schmendrick.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Schmendrick.cs @@ -9,6 +9,8 @@ namespace Server.Engines.Quests.Haven { public class Schmendrick : BaseQuester { + public override string DefaultName => "Schmendrick"; + [Constructible] public Schmendrick() : base( "the High Mage" ) { @@ -22,7 +24,6 @@ namespace Server.Engines.Quests.Haven Female = false; Body = 0x190; - Name = "Schmendrick"; } public override void InitOutfit() @@ -153,4 +154,4 @@ namespace Server.Engines.Quests.Haven int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs index 890e4a50f..08c9987e9 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs @@ -9,6 +9,8 @@ namespace Server.Engines.Quests.Haven { public class Uzeraan : BaseQuester { + public override string DefaultName => "Uzeraan"; + [Constructible] public Uzeraan() : base( "the Conjurer" ) { @@ -22,7 +24,6 @@ namespace Server.Engines.Quests.Haven Female = false; Body = 0x190; - Name = "Uzeraan"; } public override void InitOutfit() @@ -431,4 +432,4 @@ namespace Server.Engines.Quests.Haven int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs index 72f43bf09..1acd07d23 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs @@ -60,22 +60,22 @@ namespace Server.Engines.Quests.Haven get { /* The guard speaks to you as you come closer...

- * + * * Greetings traveler!

- * + * * Uzeraan, the lord of this house and overseer of this city - * Haven, has requested an audience with you.

- * + * * Hordes of gruesome hell spawn are beginning to overrun the * city and terrorize the inhabitants. No one seems to be able * to stop them.

- * + * * Our fine city militia is falling to the evil creatures * one battalion after the other.

- * + * * Uzeraan, whom you can find through these doors, is looking to * hire mercenaries to aid in the battle.

- * + * * Will you assist us? */ return 1049008; @@ -83,7 +83,7 @@ namespace Server.Engines.Quests.Haven } public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } - public override bool IsTutorial{ get{ return true; } } + public override bool IsTutorial => true; public override int Picture { @@ -229,4 +229,4 @@ namespace Server.Engines.Quests.Haven return false; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/Conversations.cs b/Scripts/Engines/Quests/Witch Apprentice/Conversations.cs index 12a6fc156..05224e483 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Conversations.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Conversations.cs @@ -12,16 +12,16 @@ namespace Server.Engines.Quests.Hag /* The ancient, wrinkled hag looks up from her vile-smelling cauldron. * Her single, unblinking eye attempts to focus in on you, but to * little avail.

- * + * * What's that? Who's there? What do you want with me? I don't have * time for the likes of you. I have stews to spice and brews to boil. * Too many things to complete to be helping out a stranger.

- * + * * Besides, it looks as if you've already got yourself a quest that needs * doing. Perhaps if you finish the task you're on, you can return to me * and I'll help you out. But until then, leave an old witch alone to her * magics! Shoo! Away with ye!

- * + * * The witch rushes you off with a wave of her decrepit hand and returns * to tending the noxious brew boiling in her cauldron. */ @@ -29,7 +29,7 @@ namespace Server.Engines.Quests.Hag } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public DontOfferConversation() { @@ -44,18 +44,18 @@ namespace Server.Engines.Quests.Hag { /* Somewhat out of character for the vile old witch, she actually seems * delighted that you've accepted her offer.

- * + * * Ah! That's the spirit! You're not a useless bag of bones after all, are ye? * Well then, best get your hind quarters in gear and head towards the road! * Remember, my young Apprentice could be anywhere along the road heading towards * the Yew Graveyard, so be sure to run the whole course of it, and stay * on track!

- * + * * And for Gashnak's sake, come back here when you've found something! And remember, * I don't have all day! And watch out for the imp Zeefzorpul! And don't return * empty handed! And pack a warm sweater! And don't trample my lawn on the * way out!

- * + * * What are you still doing here? Get to it! Shoo! */ return 1055002; @@ -79,7 +79,7 @@ namespace Server.Engines.Quests.Hag get { /* The wrinkled hag looks up at you with venom in her eyes.

- * + * * What're you doing back here? I thought I told you to go find my lost * Apprentice! I don't have time for your laziness, you wretched little worm! * Shoo! Away with ye! And don't come back until you've found out what's @@ -89,7 +89,7 @@ namespace Server.Engines.Quests.Hag } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public HagDuringCorpseSearchConversation() { @@ -105,10 +105,10 @@ namespace Server.Engines.Quests.Hag /* You inspect the charred and bloodied corpse, recognizing it from the * Hag's description as the lost Apprentice you were tasked to * bring back.

- * + * * It appears as if he has been scorched by fire and magic, and scratched * at with vicious claws.

- * + * * You wonder if this horrific act is the work of the vile imp Zeefzorpul * of which the Hag spoke. You decide you'd best return to the Hag and * report your findings. @@ -135,27 +135,27 @@ namespace Server.Engines.Quests.Hag { /* The wrinkled old Hag looks up from her cauldron of boiling * innards.

- * + * * Bah! Back already? Can't you see I'm busy with my cooking? You * wouldn't like to have a little taste of my delicious dragon gizzard soup, * would you? Haw! I thought as much.

- * + * * Enough of this jibber-jabber then - what news of my Apprentice?

- * + * * What's that? You say that horrible little imp Zeefzorpul was behind his * disappearance!? What would Zeefzorpul want with my Apprentice? Probably * just wants to make life more miserable for me than it already is.

- * + * * Wait! Bah! That must be it! Zeefzorpul must have found out that I sent * my Apprentices out with various Magic Brew Recipes - lists of tasks and * ingredients that needed completing.

- * + * * That despicable Zeefzorpul knows I need the list of ingredients I gave to * that Apprentice. I've recipes to mix, stews to boil, magics to cast, and * fortunes to meddle! I won't let that wretched felchscum spoil my day. * You then, I need you to go find Zeefzorpul and get that scrap of * parchment back!

- * + * * I'm not sure where he bides his time, but I'm sure if you go find his imp * friends and rough them up, they'll squeal on him in no time! They all * know each others' secret hiding places. Go on! Shoo! Go slay a few imps @@ -182,11 +182,11 @@ namespace Server.Engines.Quests.Hag get { /* The sickly old hag looks up from her boiling cauldron.

- * + * * Have you found that vile little Zeefzorpul yet? What!? You've come * back here without finding out where Zeefzorpul is, and what he's done * with my Magic Brew Recipe?

- * + * * I told you what needs to be done, you little whelp! Now away with ye! * And don't you return until you've found my list of ingredients! */ @@ -194,7 +194,7 @@ namespace Server.Engines.Quests.Hag } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public HagDuringImpSearchConversation() { @@ -210,23 +210,23 @@ namespace Server.Engines.Quests.Hag get { /* The wretched imp cries out for mercy.

- * + * * Forgive me! You master! You great warrior, great hooman, great greatest! * Forgive! Forgive! I give up Zeef! He no good any way! He always smack me * head and hurt me good! He say I ugly too, even with me pretty teef!

- * + * * But I knows where he hide! I follow him flapping to his hidey hole. * He think he so smart but he so wrong! I make scribble drawing of where he * like to hide! But you need the whistle blower to make him come! He no come * without it! Make with the whistle at his hidey place, and Zeef must come, * he cannot resist!

- * + * * The frightened imp hands you a crumpled map and a strange flute.

- * + * * You go to where the picture shows and then you play that whistle! Zeef come, * me promise! But you make promise that you smack Zeef head good! * Pweese?

- * + * * With this last request, the miserable little imp falls and breathes no more. */ return 1055007; @@ -270,30 +270,30 @@ namespace Server.Engines.Quests.Hag { /* In a puff of smoke that smells of brimstone, the imp Zeefzorpul * appears.

- * + * * Wuh-whut!? How did stupid hooman find mighty Zeefzorpul? This crazy * many times! This crazy not possible! This big crazy with crazy on top! * But it happening! How can it be true!?

- * + * * GAH! Even mighty Zeefzorpul can no resist that crazy music! Mighty * Zeefzorpul do what you want! Have you stupid paper back! Mighty Zeefzorpul * no want it any way. It dumb. It super dumb. Big dumb like stupid dumb * tree with dumb things on it! So stupid! So dumb that mighty Zeefzorpul * not even care! You see me not caring? You better cause it certainly * happening! Me not caring one bit!

- * + * * The strange little imp tosses the piece of parchment at you. Much * to your surprise, however, he swoops down in a flash of flapping wings * and steals the Magic Flute from your grasp.

- * + * * Hah! So stupid like a hooman! Mighty Zeefzorpul has defeated stupid * hooman and is greatest ever imp in world! You serious stupid, mister * hooman. Big stupid with stupid on top. Now you no can make trick on me * again with crazy dance music! Mighty Zeefzorpul fly away to his other * secret home where you never find him again!

- * + * * Me hope you get eated by a troll!

- * + * * With that, the imp Zeefzorpul disappears in another puff of rancid smoke. */ return 1055008; @@ -318,17 +318,17 @@ namespace Server.Engines.Quests.Hag { /* The wart-covered witch looks up from pouring fetid scraps of meat * into her cauldron.

- * + * * You've dealt with that troublesome imp Zeefzorpul? Good for you, little * one! You're not as useless as you appear, even to a daft old wench such * as myself!

- * + * * Now then, I see you've recovered my precious Magic Brew Recipe. I suppose * you expect a reward? Well, you can go on expecting, and I can go on being * ugly. What good is it to me that I have the list, if I don't have an * apprentice to go gather the ingredients and perform the tasks * themselves!

- * + * * If you want your precious little reward, you'll have to complete the task * I gave to my previous Apprentice. Now away with you! Shoo! Shimmy! Skedattle! * I've heads to boil and stews to spice! Don't you return until you've completed @@ -356,19 +356,19 @@ namespace Server.Engines.Quests.Hag { /* The ancient crone looks up from her bubbling brew, staring you down * with her one good eye.

- * + * * You've returned already have you? And what of your task? Have you gathered * all the needed ingredients?

- * + * * What's that!? You still haven't finished the simple little task I've set before * you? Then why come back here and bother me? I can't get a single brew * concocted if you keep bugging me with your whimpering little diatribes! Why, * you're worse than my last apprentice - and he was the very king of fools!

- * + * * Go on with ye! Away and begone! I don't want to see hide nor hair of your * whining little face until you've gathered each and every last one of the ingredients * on that list!

- * + * * With a disgusting hacking noise, the vile witch spits upon the ground and * brushes you off with a wave of her wrinkled old hand. */ @@ -376,7 +376,7 @@ namespace Server.Engines.Quests.Hag } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public HagDuringIngredientsConversation() { @@ -391,28 +391,28 @@ namespace Server.Engines.Quests.Hag { /* The bawdy old pirate captain looks up from his bottle of Wild Harpy * whiskey, as drunk as any man you've ever seen.

- * + * * With an excruciatingly slow movement, he pushes back his tricorne hat * and stares you down with red-rimmed eyes.

- * + * * Whut tha blazes do ye want, landlubber? Some've Captain Blackheart's * fine Whiskey? Well ye can drown in the seven seas, ya barnacle-covered * bilge rat!

- * + * * I've cut down pasty-faced runts like yerself for lesser insults! I've * sailed the seas've this world fer fifty years, and never seen a more * milk-soaked pansy lass than ye come in here for a favor. Give ye some * of my special Whiskey? I'd sooner wrestle a sea serpent naked - and I've * done that some twenty times!

- * + * * Ye see, ol' Captain Blackheart's Whiskey is only for pirate folk. And ye * don't look like no pirate I've ever seen. Ye have te have the right cut * of cloth and the right amount of liquor in yer belly te sail on my crew! * And without that, ye might as well go home and cry to yer mommy. Cause * ye ain't ever gonna share no drink with me!

- * + * * Now off with ye!

- * + * * With that, Captain Blackheart goes back to singing his bawdy songs * and drinking his whiskey. It seems as if you'll have to find some way to * change his mind about your worthiness. @@ -451,11 +451,11 @@ namespace Server.Engines.Quests.Hag * and down.

Well that's more like it, me little deck swabber! * Ye almost look like ye fit in around here, ready te sail the great seas * of Britannia, sinking boats and slaying sea serpents!

- * + * * But can ye truly handle yerself? Ye might think ye can test me meddle * with a sip or two of yer dandy wine, but a real pirate walks the decks * with a belly full of it. Lookit that, yer not even wobblin'!

- * + * * Ye've impressed me a bit, ye wee tyke, but it'll take more'n that te * join me crew!

Captain Blackheart tips his mug in your direction, * offering up a jolly laugh, but it seems you still haven't impressed him @@ -467,21 +467,21 @@ namespace Server.Engines.Quests.Hag { /* Captain Blackheart looks up from polishing his cutlass, glaring at * you with red-rimmed eyes.

- * + * * Well, well. Lookit the wee little deck swabby. Aren't ye a cute lil' * lassy? Don't ye look just fancy? Ye think yer ready te join me pirate * crew? Ye think I should offer ye some've me special Blackheart brew?

- * + * * I'll make ye walk the plank, I will! We'll see how sweet n' darlin' ye * look when the sea serpents get at ye and rip ye te threads! Won't that be * a pretty picture, eh?

- * + * * Ye don't have the stomach fer the pirate life, that's plain enough te me. Ye * prance around here like a wee lil' princess, ye do. If ye want to join my * crew ye can't just look tha part - ye have to have the stomach fer it, filled * up with rotgut until ye can't see straight. I don't drink with just any ol' * landlubber! Ye'd best prove yer mettle before ye talk te me again!

- * + * * The drunken pirate captain leans back in his chair, taking another gulp of * his drink before he starts in on another bawdy pirate song. */ @@ -493,18 +493,18 @@ namespace Server.Engines.Quests.Hag if ( m_Drunken ) { /* The inebriated pirate looks up at you with a wry grin.

- * + * * Well hello again, me little matey. I see ye have a belly full of rotgut * in ye. I bet ye think you're a right hero, ready te face the world. But * as I told ye before, bein' a member of my pirate crew means more'n just * being able to hold yer drink. Ye have te look the part - and frankly, me * little barnacle, ye don't have the cut of cloth te fit in with the crowd I * like te hang around.

- * + * * So scurry off, ye wee sewer rat, and don't come back round these parts all * liquored up an' three sheets te tha wind, unless yer truly ready te join * me pirate crew!

- * + * * Captain Blackheart shoves you aside, banging his cutlass against the * table as he calls to the waitress for another round. */ @@ -514,14 +514,14 @@ namespace Server.Engines.Quests.Hag { /* Captain Blackheart looks up from his drink, almost tipping over * his chair as he looks you up and down.

- * + * * You again? I thought I told ye te get lost? Go on with ye! Ye ain't * no pirate - yer not even fit te clean the barnacles off me rear end! * Don't ye come back babbling te me for any of me Blackheart Whiskey until * ye look and act like a true pirate!

- * + * * Now shove off, sewer rat - I've got drinkin' te do!

- * + * * The inebriated pirate bolts back another mug of ale and brushes you * off with a wave of his hand. */ @@ -531,7 +531,7 @@ namespace Server.Engines.Quests.Hag } } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; public BlackheartNoPirateConversation( bool tricorne, bool drunken ) { @@ -572,18 +572,18 @@ namespace Server.Engines.Quests.Hag { /* The bawdy old pirate captain looks up from his bottle of Wild Harpy * whiskey, as drunk as any man you've ever seen.

- * + * * Avast ye, ye loveable pirate! Just in from sailin' the glorious sea? Ye * look right ready te fall down on the spot, ye do!

- * + * * I tell ye what, from the look've ye, ye deserve a belt of better brew than * the slop ye've been drinking, and I've just the thing.

- * + * * I call it Captain Blackheart's Whiskey, and it'll give ye hairs on yer chest, * that's for sure. Why, a keg of this stuff once spilled on my ship, and it * ate a hole right through the deck!

Go on, drink up, or use it to clean * the rust off your cutlass - it's the best brew, either way!

- * + * * Captain Blackheart hands you a jug of his famous Whiskey. You think it best * to return it to the Hag, rather than drink any of the noxious swill. */ @@ -593,21 +593,21 @@ namespace Server.Engines.Quests.Hag { /* The drunken pirate, Captain Blackheart, looks up from his bottle * of whiskey with a pleased expression.

- * + * * Well looky here! I didn't think a landlubber like yourself had the pirate * blood in ye! But look at that! You certainly look the part now! Sure * you can still keep on your feet? Har!

- * + * * Avast ye, ye loveable pirate! Ye deserve a belt of better brew than the slop * ye've been drinking, and I've just the thing.

- * + * * I call it Captain Blackheart's Whiskey, and it'll give ye hairs on yer chest, * that's for sure. Why, a keg of this stuff once spilled on my ship, and it ate * a hole right through the deck!

- * + * * Go on, drink up, or use it to clean the rust off your cutlass - it's the best * brew, either way!

- * + * * Captain Blackheart hands you a jug of his famous Whiskey. You think it best * to return it to the Hag, rather than drink any of the noxious swill. */ @@ -656,25 +656,25 @@ namespace Server.Engines.Quests.Hag { /* The horrible wretch of a witch looks up from her vile experiments * and focuses her one good eye on you.

- * + * * Eh? What's that? You say you've gathered the ingredients for my delicious * Magic Brew?

- * + * * Well, well, I don't know exactly what to say. I thought for sure you'd * end up dead! Haw! Can't blame a lady for wishing, can you? Even if she * is a bit old and wrinkled.

- * + * * Well, I promised you a reward for your efforts, and I never lie - leastways * not to someone like you, after the great sacrifices you've made. You know, * I could use a new Apprentice, in an official capacity as it were. I couldn't * convince you to stay around and help me out some more could I? There's always * cauldrons that need cleaning, dung that needs shoveling, newts eye that * needs a proper chewing, and fires that need stoking.

- * + * * What's that? Not interested? Well, I suppose you have great things ahead of * you and all that. Feh! Like a puckish little puke like you could ever make * something of themselves in this cold old world!

- * + * * Nevertheless, I'll give you your blasted reward, and you'd better be happy * with it because it's all you're getting. Caused me enough trouble as it is. * Here, take it, and be off with you! It'll be a pleasure to my eye if I @@ -683,7 +683,7 @@ namespace Server.Engines.Quests.Hag * water! Think you're so great...why, I remember when we didn't even have * soap, and water was made by tiny little fairies and cost a gold piece for * a thimbleful...I could tell you some stories, I could...

- * + * * Your reward in hand, you decide to leave the old Hag to her mumblings * before she realizes you're still around and puts you back to work. */ @@ -709,13 +709,13 @@ namespace Server.Engines.Quests.Hag { /* The wrinkled old crone stops stirring her noxious stew, looking up at * you with an annoyed expression on her face.

- * + * * You again? Listen, you little wretch, I'm in no mood for any of your meddlesome * requests. I've work to do, and no time for your whining.

- * + * * Come back later, and maybe I'll have something for you to do. In the meantime, * get out of my sight - and don't touch anything on your way out!

- * + * * The vile hag hacks up a gob of phlegm, spitting it on the ground before * returning to her work. */ @@ -727,6 +727,6 @@ namespace Server.Engines.Quests.Hag { } - public override bool Logged{ get{ return false; } } + public override bool Logged => false; } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs b/Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs index 887d3f9b5..224cb8ef6 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs @@ -36,7 +36,7 @@ namespace Server.Engines.Quests.Hag // chicken gizzard new IngredientInfo( 1055023, 5, typeof( Chicken ) ), // rat tail - new IngredientInfo( 1055024, 5, typeof( Rat ), typeof( GiantRat ), typeof( Sewerrat ) ), + new IngredientInfo( 1055024, 5, typeof( Rat ), typeof( GiantRat ), typeof( SewerRat ) ), // frog's leg new IngredientInfo( 1055025, 5, typeof( BullFrog ) ), // deer heart @@ -109,4 +109,4 @@ namespace Server.Engines.Quests.Hag m_Quantity = quantity; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs index fd148a05a..a75298faa 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs @@ -8,6 +8,8 @@ namespace Server.Engines.Quests.Hag { public class Blackheart : BaseQuester { + public override string DefaultName => "Captain Blackheart"; + [Constructible] public Blackheart() : base( "the Drunken Pirate" ) { @@ -25,7 +27,6 @@ namespace Server.Engines.Quests.Hag Female = false; Body = 0x190; - Name = "Captain Blackheart"; } public override void InitOutfit() @@ -117,4 +118,4 @@ namespace Server.Engines.Quests.Hag Heave(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs index d22f6d014..deebdd5ea 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs @@ -8,7 +8,8 @@ namespace Server.Engines.Quests.Hag { public class Grizelda : BaseQuester { - public override bool ClickTitle{ get{ return true; } } + public override bool ClickTitle => true; + public override string DefaultName => "Grizelda"; [Constructible] public Grizelda() : base( "the Hag" ) @@ -27,7 +28,6 @@ namespace Server.Engines.Quests.Hag Female = true; Body = 0x191; - Name = "Grizelda"; } public override void InitOutfit() @@ -133,7 +133,7 @@ namespace Server.Engines.Quests.Hag else { Item item; - + if ( Core.AOS ) { item = Loot.RandomArmorOrShieldOrJewelry(); @@ -217,4 +217,4 @@ namespace Server.Engines.Quests.Hag int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Zeefzorpul.cs b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Zeefzorpul.cs index f703abd2b..cc20cc94d 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Zeefzorpul.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Zeefzorpul.cs @@ -7,6 +7,8 @@ namespace Server.Engines.Quests.Hag { public class Zeefzorpul : BaseQuester { + public override string DefaultName => "Zeefzorpul"; + public Zeefzorpul() { } @@ -14,7 +16,6 @@ namespace Server.Engines.Quests.Hag public override void InitBody() { Body = 0x4A; - Name = "Zeefzorpul"; } public Zeefzorpul( Serial serial ) : base( serial ) @@ -46,4 +47,4 @@ namespace Server.Engines.Quests.Hag Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs b/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs index aa697be9f..569e36042 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs @@ -50,36 +50,36 @@ namespace Server.Engines.Quests.Hag /* The ancient, wrinkled hag looks up from her vile-smelling cauldron. * Her single, unblinking eye attempts to focus in on you, but to * little avail.

- * + * * Eh? Who is it? Who's there? Come to trouble an old woman have you?

- * + * * I'll split ye open and swallow yer guts! I'll turn ye into a pile * o' goo, I will! Bah! As if I didn't have enough to worry about. As if I've * not enough trouble as it is!

- * + * * Another of my blasted apprentices has gone missing! Foolish children, * think they know everything. I should turn the lot of them into toads - * if only they'd return with their task complete! But that's the trouble, innit? * They never return!

- * + * * But you don't care, do ye? I suppose you're another one of those meddlesome kids, * come to ask me for something? Eh? Is that it? You want something from me, * expect me to hand it over? I've enough troubles with my apprentices, and that * vile imp, Zeefzorpul! Why, I bet it's him who's got the lot of them! And who * knows what he's done? Vile little thing.

- * + * * If you expect me to help you with your silly little desires, you'll be doing * something for me first, eh? I expect you to go seek out my apprentice. * I sent him along the road west of here up towards Yew's graveyard, but he never * came back. Find him, and bring him back, and I'll give you a little reward that * I'm sure you'll find pleasant.

- * + * * But I tells ye to watch out for the imp name've Zeefzorpul! He's a despicable * little beast who likes to fool and fiddle with folk and generally make life * miserable for everyone. If ye get him on your bad side, you're sure to end up * ruing the day ye were born. As if you didn't already, with an ugly mug * like that!

- * + * * Well, you little whelp? Going to help an old hag or not? */ return 1055001; @@ -87,7 +87,7 @@ namespace Server.Engines.Quests.Hag } public override TimeSpan RestartDelay{ get{ return TimeSpan.FromMinutes( 5.0 ); } } - public override bool IsTutorial{ get{ return false; } } + public override bool IsTutorial => false; public override int Picture{ get{ return 0x15D3; } } @@ -138,4 +138,4 @@ namespace Server.Engines.Quests.Hag return m_ZeefzorpulLocations[index]; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Spawner/ProximitySpawner.cs b/Scripts/Engines/Spawner/ProximitySpawner.cs index 4d12af3fe..02decc20e 100644 --- a/Scripts/Engines/Spawner/ProximitySpawner.cs +++ b/Scripts/Engines/Spawner/ProximitySpawner.cs @@ -90,7 +90,7 @@ namespace Server.Mobiles End = DateTime.UtcNow; } - public override bool HandlesOnMovement { get { return true; } } + public override bool HandlesOnMovement => true; public virtual bool ValidTrigger( Mobile m ) { diff --git a/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs b/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs index 6edce4f82..242dafe00 100644 --- a/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs +++ b/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs @@ -17,11 +17,11 @@ namespace Server.Misc ToTTwo, ToTThree } - + public class TreasuresOfTokuno { public const int ItemsPerReward = 10; - + private static Type[] m_LesserArtifactsTotal = new Type[] { typeof( AncientFarmersKasa ), typeof( AncientSamuraiDo ), typeof( ArmsOfTacticalExcellence ), typeof( BlackLotusHood ), @@ -30,18 +30,18 @@ namespace Server.Misc typeof( TomeOfEnlightenment ), typeof( AncientUrn ), typeof( HonorableSwords ), typeof( PigmentsOfTokuno ), typeof( FluteOfRenewal ), typeof( LeurociansMempoOfFortune ), typeof( LesserPigmentsOfTokuno ), typeof( MetalPigmentsOfTokuno ), typeof( ChestOfHeirlooms ) }; - + public static Type[] LesserArtifactsTotal { get { return m_LesserArtifactsTotal; } } - + private static TreasuresOfTokunoEra _DropEra = TreasuresOfTokunoEra.None; private static TreasuresOfTokunoEra _RewardEra = TreasuresOfTokunoEra.ToTOne; - + public static TreasuresOfTokunoEra DropEra { get { return _DropEra; } set { _DropEra = value; } } - + public static TreasuresOfTokunoEra RewardEra { get { return _RewardEra; } @@ -62,7 +62,7 @@ namespace Server.Misc new Type[] { typeof( MetalPigmentsOfTokuno ), typeof( AncientFarmersKasa ), typeof( AncientSamuraiDo ), typeof( ArmsOfTacticalExcellence ), typeof( MetalPigmentsOfTokuno ), typeof( BlackLotusHood ), typeof( DaimyosHelm ), typeof( DemonForks ), - typeof( MetalPigmentsOfTokuno ), typeof( DragonNunchaku ), typeof( Exiler ), typeof( GlovesOfTheSun ), typeof( HanzosBow ), + typeof( MetalPigmentsOfTokuno ), typeof( DragonNunchaku ), typeof( Exiler ), typeof( GlovesOfTheSun ), typeof( HanzosBow ), typeof( MetalPigmentsOfTokuno ), typeof( LegsOfStability ), typeof( PeasantsBokuto ), typeof( PilferedDancerFans ), typeof( TheDestroyer ), typeof( MetalPigmentsOfTokuno ), typeof( TomeOfEnlightenment ), typeof( AncientUrn ), typeof( HonorableSwords ), typeof( MetalPigmentsOfTokuno ), typeof( FluteOfRenewal ), typeof( ChestOfHeirlooms ) @@ -78,13 +78,13 @@ namespace Server.Misc } }; - public static Type[] LesserArtifacts - { + public static Type[] LesserArtifacts + { get { return m_LesserArtifacts[(int)RewardEra-1]; } } private static Type[][] m_GreaterArtifacts = null; - + public static Type[] GreaterArtifacts { get @@ -92,11 +92,11 @@ namespace Server.Misc if( m_GreaterArtifacts == null ) { m_GreaterArtifacts = new Type[ToTRedeemGump.NormalRewards.Length][]; - + for( int i = 0; i < m_GreaterArtifacts.Length; i++ ) { m_GreaterArtifacts[i] = new Type[ToTRedeemGump.NormalRewards[i].Length]; - + for( int j = 0; j < m_GreaterArtifacts[i].Length; j++ ) { m_GreaterArtifacts[i][j] = ToTRedeemGump.NormalRewards[i][j].Type; @@ -153,7 +153,7 @@ namespace Server.Misc if( chance > Utility.RandomDouble() ) { Item i = null; - + try { i = Activator.CreateInstance( m_LesserArtifacts[(int)DropEra-1][Utility.Random( m_LesserArtifacts[(int)DropEra-1].Length )] ) as Item; @@ -164,7 +164,7 @@ namespace Server.Misc if( i != null ) { pm.SendLocalizedMessage( 1062317 ); // For your valor in combating the fallen beast, a special artifact has been bestowed on you. - + if( !pm.PlaceInBackpack( i ) ) { if( pm.BankBox != null && pm.BankBox.TryDropItem( killer, i, false ) ) @@ -175,7 +175,7 @@ namespace Server.Misc i.MoveToWorld( pm.Location, pm.Map ); } } - + pm.ToTTotalMonsterFame = 0; } } @@ -187,15 +187,16 @@ namespace Server.Mobiles { public class IharaSoko : BaseVendor { - public override bool IsActiveVendor { get { return false; } } - public override bool IsInvulnerable { get { return true; } } - public override bool DisallowAllMoves { get { return true; } } - public override bool ClickTitle { get { return true; } } - public override bool CanTeach { get { return false; } } + public override bool IsActiveVendor => false; + public override bool IsInvulnerable => true; + public override bool DisallowAllMoves => true; + public override bool ClickTitle => true; + public override bool CanTeach => false; + public override string DefaultName => "Ihara Soko"; protected List m_SBInfos = new List(); protected override List SBInfos { get { return m_SBInfos; } } - + public override void InitSBInfo() { } @@ -212,11 +213,9 @@ namespace Server.Mobiles AddItem( item ); } - [Constructible] public IharaSoko() : base( "the Imperial Minister of Trade" ) { - Name = "Ihara Soko"; Female = false; Body = 0x190; Hue = 0x8403; @@ -232,7 +231,7 @@ namespace Server.Mobiles writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -260,7 +259,7 @@ namespace Server.Mobiles SayTo( pm, 1070980 ); // Congratulations! You have turned in enough minor treasures to earn a greater reward. pm.CloseGump( typeof( ToTTurnInGump ) ); //Sanity - + if( !pm.HasGump( typeof( ToTRedeemGump ) ) ) pm.SendGump( new ToTRedeemGump( this, false ) ); } @@ -326,10 +325,10 @@ namespace Server.Gumps Item item = (Item)items[i]; if( item is ChestOfHeirlooms && !((ChestOfHeirlooms)item).Locked ) continue; - + if( item is ChestOfHeirlooms && ((ChestOfHeirlooms)item).TrapLevel != 10 ) continue; - + if( item is PigmentsOfTokuno && ((PigmentsOfTokuno)item).Type != PigmentType.None ) continue; @@ -390,7 +389,7 @@ namespace Server.Gumps if( pm == null || !pm.InRange( m_Collector.Location, 7 ) ) return; - + if( pm.ToTItemsTurnedIn == 0 ) m_Collector.SayTo( pm, 1071013 ); // Bring me 10 of the lost treasures of Tokuno and I will reward you with a valuable item. else if( pm.ToTItemsTurnedIn < TreasuresOfTokuno.ItemsPerReward ) //This case should ALWAYS be true with this gump, jsut a sanity check @@ -494,7 +493,7 @@ namespace Server.Gumps #endregion public static TypeTileButtonInfo[][] NormalRewards - { + { get { return m_NormalRewards; } } @@ -543,7 +542,7 @@ namespace Server.Gumps #endregion public static PigmentsTileButtonInfo[][] PigmentRewards - { + { get { return m_PigmentRewards; } } @@ -634,4 +633,4 @@ Pigments of tokuno do NOT check for if item is already hued 0; APPARENTLY he st Chest of Heirlooms don't show if unlocked. Chest of heirlooms, locked, HARD to pick at 100 lock picking but not impossible. had 95 health to 0, cause it's trapped >< (explosion i think) -*/ \ No newline at end of file +*/ diff --git a/Scripts/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs b/Scripts/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs index 8a78655e9..f327a92dc 100644 --- a/Scripts/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs +++ b/Scripts/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs @@ -9,16 +9,16 @@ namespace Server.Mobiles [CorpseName( "a killer pumpkin corpse" )] public class PumpkinHead : BaseCreature { - public override bool AutoDispel { get { return true; } } - public override bool BardImmune { get { return true; } } - public override bool Unprovokable { get { return true; } } - public override bool AreaPeaceImmune { get { return true; } } + public override bool AutoDispel => true; + public override bool BardImmune => true; + public override bool Unprovokable => true; + public override bool AreaPeaceImmune => true; + public override string DefaultName => "a killer pumpkin"; [Constructible] public PumpkinHead() : base( Utility.RandomBool() ? AIType.AI_Melee : AIType.AI_Mage, FightMode.Closest, 10, 1, 0.05, 0.1 ) { - Name = "a killer pumpkin"; Body = 1246 + Utility.Random( 2 ); BaseSoundID = 268; diff --git a/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs b/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs index 69aa30c3f..0d053cf43 100644 --- a/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs +++ b/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs @@ -248,7 +248,7 @@ namespace Server.Engines.Events AddLoot( LootPack.Meager ); } - public override bool BleedImmune { get { return true; } } + public override bool BleedImmune => true; public override Poison PoisonImmune { get { return Poison.Regular; } } @@ -287,4 +287,4 @@ namespace Server.Engines.Events m_DeadPlayer = ( PlayerMobile )reader.ReadMobile(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/BaseAddonContainer.cs b/Scripts/Items/Addons/BaseAddonContainer.cs index 4d00a5c83..0c6d35e26 100644 --- a/Scripts/Items/Addons/BaseAddonContainer.cs +++ b/Scripts/Items/Addons/BaseAddonContainer.cs @@ -9,7 +9,7 @@ namespace Server.Items { public abstract class BaseAddonContainer : BaseContainer, IChopable, IAddon { - public override bool DisplayWeight { get { return false; } } + public override bool DisplayWeight => false; [Hue, CommandProperty( AccessLevel.GameMaster )] public override int Hue diff --git a/Scripts/Items/Addons/DartBoard.cs b/Scripts/Items/Addons/DartBoard.cs index de94ea616..8f8e1808f 100644 --- a/Scripts/Items/Addons/DartBoard.cs +++ b/Scripts/Items/Addons/DartBoard.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class DartBoard : AddonComponent { - public override bool NeedsWall{ get{ return true; } } + public override bool NeedsWall => true; public override Point3D WallPosition{ get{ return this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); } } public bool East{ get{ return this.ItemID == 0x1E2F; } } @@ -215,4 +215,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/GozaMats.cs b/Scripts/Items/Addons/GozaMats.cs index 4dc614b5f..2208b160a 100644 --- a/Scripts/Items/Addons/GozaMats.cs +++ b/Scripts/Items/Addons/GozaMats.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new GozaMatEastDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public GozaMatEastAddon() : this( 0 ) @@ -74,7 +74,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new GozaMatSouthDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public GozaMatSouthAddon() : this( 0 ) @@ -142,7 +142,7 @@ namespace Server.Items public override BaseAddonDeed Deed{ get{ return new SquareGozaMatEastDeed(); } } public override int LabelNumber{ get{ return 1030688; } } // goza mat - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public SquareGozaMatEastAddon() : this( 0 ) @@ -208,7 +208,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new SquareGozaMatSouthDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public SquareGozaMatSouthAddon() : this( 0 ) @@ -275,7 +275,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new BrocadeGozaMatEastDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public BrocadeGozaMatEastAddon() : this( 0 ) @@ -341,7 +341,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new BrocadeGozaMatSouthDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public BrocadeGozaMatSouthAddon() : this( 0 ) @@ -407,7 +407,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new BrocadeSquareGozaMatEastDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public BrocadeSquareGozaMatEastAddon() : this( 0 ) @@ -473,7 +473,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new BrocadeSquareGozaMatSouthDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public BrocadeSquareGozaMatSouthAddon() : this( 0 ) @@ -535,4 +535,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/LargeStoneTableEastAddon.cs b/Scripts/Items/Addons/LargeStoneTableEastAddon.cs index 819421695..2d25e77f3 100644 --- a/Scripts/Items/Addons/LargeStoneTableEastAddon.cs +++ b/Scripts/Items/Addons/LargeStoneTableEastAddon.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new LargeStoneTableEastDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public LargeStoneTableEastAddon() : this( 0 ) @@ -70,4 +70,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs b/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs index cde6a38a7..fd28c96b7 100644 --- a/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs +++ b/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new LargeStoneTableSouthDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public LargeStoneTableSouthAddon() : this( 0 ) @@ -70,4 +70,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/MediumStoneTableEastAddon.cs b/Scripts/Items/Addons/MediumStoneTableEastAddon.cs index 716a65614..9920e0e55 100644 --- a/Scripts/Items/Addons/MediumStoneTableEastAddon.cs +++ b/Scripts/Items/Addons/MediumStoneTableEastAddon.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new MediumStoneTableEastDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public MediumStoneTableEastAddon() : this( 0 ) @@ -69,4 +69,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/MediumStoneTableSouthAddon.cs b/Scripts/Items/Addons/MediumStoneTableSouthAddon.cs index 1d2233987..177a07449 100644 --- a/Scripts/Items/Addons/MediumStoneTableSouthAddon.cs +++ b/Scripts/Items/Addons/MediumStoneTableSouthAddon.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override BaseAddonDeed Deed{ get{ return new MediumStoneTableSouthDeed(); } } - public override bool RetainDeedHue{ get{ return true; } } + public override bool RetainDeedHue => true; [Constructible] public MediumStoneTableSouthAddon() : this( 0 ) @@ -69,4 +69,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/RejuvinationAnkhs.cs b/Scripts/Items/Addons/RejuvinationAnkhs.cs index eac0977af..b7ff68a50 100644 --- a/Scripts/Items/Addons/RejuvinationAnkhs.cs +++ b/Scripts/Items/Addons/RejuvinationAnkhs.cs @@ -83,7 +83,7 @@ namespace Server.Items { } - public override bool HandlesOnMovement{ get{ return true; } } + public override bool HandlesOnMovement => true; private DateTime m_NextMessage; @@ -177,4 +177,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SolenAntHole.cs b/Scripts/Items/Addons/SolenAntHole.cs index adbb45c69..966f7c00d 100644 --- a/Scripts/Items/Addons/SolenAntHole.cs +++ b/Scripts/Items/Addons/SolenAntHole.cs @@ -22,7 +22,7 @@ namespace Server.Items if ( map == Map.Trammel || map == Map.Felucca ) { from.MoveToWorld( new Point3D( 5922, 2024, 0 ), map ); - PublicOverheadMessage( MessageType.Regular, 0x3B2, true, String.Format( "* {0} dives into the hole and disappears!*", from.Name ) ); + PublicOverheadMessage( MessageType.Regular, 0x3B2, true, String.Format( "* {0} dives into the hole and disappears!*", from.Name ) ); } } else @@ -51,8 +51,8 @@ namespace Server.Items public class SolenAntHole : BaseAddon { - public override bool ShareHue { get { return false; } } - public override bool HandlesOnMovement { get { return true; } } + public override bool ShareHue => false; + public override bool HandlesOnMovement => true; private List m_Spawned; @@ -77,7 +77,7 @@ namespace Server.Items { if ( !m.Player || !m.Alive || m.Hidden || !SpawnKilled() ) return; - + if ( Utility.InRange( Location, m.Location, 3 ) && !Utility.InRange( Location, oldLocation, 3 ) ) { int count = 1 + Utility.Random( 4 ); diff --git a/Scripts/Items/Aquarium/AquariumFishingNet.cs b/Scripts/Items/Aquarium/AquariumFishingNet.cs index 9d55d2d2b..dcfa2315e 100644 --- a/Scripts/Items/Aquarium/AquariumFishingNet.cs +++ b/Scripts/Items/Aquarium/AquariumFishingNet.cs @@ -23,7 +23,7 @@ namespace Server.Items { } - public override bool RequireDeepWater { get { return false; } } + public override bool RequireDeepWater => false; protected override void FinishEffect( Point3D p, Map map, Mobile from ) { diff --git a/Scripts/Items/Armor/Leather/FemaleLeafChest.cs b/Scripts/Items/Armor/Leather/FemaleLeafChest.cs index 8503cad70..c5436e6fa 100644 --- a/Scripts/Items/Armor/Leather/FemaleLeafChest.cs +++ b/Scripts/Items/Armor/Leather/FemaleLeafChest.cs @@ -25,7 +25,7 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; [Constructible] public FemaleLeafChest() : base( 0x2FCB ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/FemaleLeatherChest.cs b/Scripts/Items/Armor/Leather/FemaleLeatherChest.cs index 0e0bd0e3d..231b5ea59 100644 --- a/Scripts/Items/Armor/Leather/FemaleLeatherChest.cs +++ b/Scripts/Items/Armor/Leather/FemaleLeatherChest.cs @@ -25,7 +25,7 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; [Constructible] public FemaleLeatherChest() : base( 0x1C06 ) @@ -36,17 +36,17 @@ namespace Server.Items public FemaleLeatherChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherBustierArms.cs b/Scripts/Items/Armor/Leather/LeatherBustierArms.cs index 7513b1dbb..98c764448 100644 --- a/Scripts/Items/Armor/Leather/LeatherBustierArms.cs +++ b/Scripts/Items/Armor/Leather/LeatherBustierArms.cs @@ -25,7 +25,7 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; [Constructible] public LeatherBustierArms() : base( 0x1C0A ) @@ -36,17 +36,17 @@ namespace Server.Items public LeatherBustierArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherShorts.cs b/Scripts/Items/Armor/Leather/LeatherShorts.cs index 18b50471d..b0c15e0e3 100644 --- a/Scripts/Items/Armor/Leather/LeatherShorts.cs +++ b/Scripts/Items/Armor/Leather/LeatherShorts.cs @@ -25,7 +25,7 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; [Constructible] public LeatherShorts() : base( 0x1C00 ) @@ -36,17 +36,17 @@ namespace Server.Items public LeatherShorts( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherSkirt.cs b/Scripts/Items/Armor/Leather/LeatherSkirt.cs index 306e4485e..e20d482fb 100644 --- a/Scripts/Items/Armor/Leather/LeatherSkirt.cs +++ b/Scripts/Items/Armor/Leather/LeatherSkirt.cs @@ -25,7 +25,7 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; [Constructible] public LeatherSkirt() : base( 0x1C08 ) @@ -36,7 +36,7 @@ namespace Server.Items public LeatherSkirt( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -45,11 +45,11 @@ namespace Server.Items if ( Weight == 3.0 ) Weight = 1.0; } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/FemalePlateChest.cs b/Scripts/Items/Armor/Plate/FemalePlateChest.cs index 66cdf60f4..9f9599974 100644 --- a/Scripts/Items/Armor/Plate/FemalePlateChest.cs +++ b/Scripts/Items/Armor/Plate/FemalePlateChest.cs @@ -20,7 +20,7 @@ namespace Server.Items public override int OldDexBonus{ get{ return -5; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; public override int ArmorBase{ get{ return 30; } } @@ -35,13 +35,13 @@ namespace Server.Items public FemalePlateChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items Weight = 4.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/FemaleWoodlandChest.cs b/Scripts/Items/Armor/Plate/FemaleWoodlandChest.cs index c4adaf8ce..bbdfa7355 100644 --- a/Scripts/Items/Armor/Plate/FemaleWoodlandChest.cs +++ b/Scripts/Items/Armor/Plate/FemaleWoodlandChest.cs @@ -19,7 +19,7 @@ namespace Server.Items public override int AosStrReq{ get{ return 95; } } public override int OldStrReq{ get{ return 95; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; public override int ArmorBase{ get{ return 30; } } @@ -49,4 +49,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/FemaleStuddedChest.cs b/Scripts/Items/Armor/Studded/FemaleStuddedChest.cs index 012bd3fe3..0c78b4048 100644 --- a/Scripts/Items/Armor/Studded/FemaleStuddedChest.cs +++ b/Scripts/Items/Armor/Studded/FemaleStuddedChest.cs @@ -25,7 +25,7 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; [Constructible] public FemaleStuddedChest() : base( 0x1C02 ) @@ -36,13 +36,13 @@ namespace Server.Items public FemaleStuddedChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -52,4 +52,4 @@ namespace Server.Items Weight = 6.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/HideFemaleChest.cs b/Scripts/Items/Armor/Studded/HideFemaleChest.cs index 460f9eecf..a96299806 100644 --- a/Scripts/Items/Armor/Studded/HideFemaleChest.cs +++ b/Scripts/Items/Armor/Studded/HideFemaleChest.cs @@ -27,7 +27,7 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; [Constructible] public HideFemaleChest() : base( 0x2B79 ) @@ -45,7 +45,7 @@ namespace Server.Items writer.WriteEncodedInt( 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -53,4 +53,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedBustierArms.cs b/Scripts/Items/Armor/Studded/StuddedBustierArms.cs index a158e4113..f2ad3930f 100644 --- a/Scripts/Items/Armor/Studded/StuddedBustierArms.cs +++ b/Scripts/Items/Armor/Studded/StuddedBustierArms.cs @@ -25,7 +25,7 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; [Constructible] public StuddedBustierArms() : base( 0x1C0C ) @@ -36,17 +36,17 @@ namespace Server.Items public StuddedBustierArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Champion Artifacts/Shared/ANecromancerShroud.cs b/Scripts/Items/Champion Artifacts/Shared/ANecromancerShroud.cs index 0de2921c4..271d17631 100644 --- a/Scripts/Items/Champion Artifacts/Shared/ANecromancerShroud.cs +++ b/Scripts/Items/Champion Artifacts/Shared/ANecromancerShroud.cs @@ -12,7 +12,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public ANecromancerShroud() @@ -23,14 +23,14 @@ namespace Server.Items public ANecromancerShroud( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs b/Scripts/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs index f37553351..c692c32c9 100644 --- a/Scripts/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs +++ b/Scripts/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public BraveKnightOfTheBritannia() @@ -44,7 +44,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs b/Scripts/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs index 74cc1eedf..153b71505 100644 --- a/Scripts/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs +++ b/Scripts/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs @@ -16,7 +16,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public CaptainJohnsHat() @@ -34,14 +34,14 @@ namespace Server.Items public CaptainJohnsHat( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/DetectiveBoots.cs b/Scripts/Items/Champion Artifacts/Shared/DetectiveBoots.cs index dc381ee4b..b53cde6ba 100644 --- a/Scripts/Items/Champion Artifacts/Shared/DetectiveBoots.cs +++ b/Scripts/Items/Champion Artifacts/Shared/DetectiveBoots.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; private int m_Level; @@ -31,14 +31,14 @@ namespace Server.Items public DetectiveBoots( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs b/Scripts/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs index f00d1505a..6eea5c318 100644 --- a/Scripts/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs +++ b/Scripts/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public EmbroideredOakLeafCloak() : base( 0x2684 ) @@ -25,14 +25,14 @@ namespace Server.Items public EmbroideredOakLeafCloak( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs b/Scripts/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs index b5758fc36..510ec8370 100644 --- a/Scripts/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs +++ b/Scripts/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs @@ -16,7 +16,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public GuantletsOfAnger() @@ -31,14 +31,14 @@ namespace Server.Items public GuantletsOfAnger( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs b/Scripts/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs index bc2da8dea..dc0828b94 100644 --- a/Scripts/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs +++ b/Scripts/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public LieutenantOfTheBritannianRoyalGuard() @@ -25,14 +25,14 @@ namespace Server.Items public LieutenantOfTheBritannianRoyalGuard( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/OblivionsNeedle.cs b/Scripts/Items/Champion Artifacts/Shared/OblivionsNeedle.cs index 7f0b5ab00..016c9241c 100644 --- a/Scripts/Items/Champion Artifacts/Shared/OblivionsNeedle.cs +++ b/Scripts/Items/Champion Artifacts/Shared/OblivionsNeedle.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public OblivionsNeedle() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs b/Scripts/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs index 48d0affdb..7894725be 100644 --- a/Scripts/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs +++ b/Scripts/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public RoyalGuardSurvivalKnife() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/SamaritanRobe.cs b/Scripts/Items/Champion Artifacts/Shared/SamaritanRobe.cs index 77fe4c5eb..6be83d8ae 100644 --- a/Scripts/Items/Champion Artifacts/Shared/SamaritanRobe.cs +++ b/Scripts/Items/Champion Artifacts/Shared/SamaritanRobe.cs @@ -12,7 +12,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public SamaritanRobe() @@ -23,14 +23,14 @@ namespace Server.Items public SamaritanRobe( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs b/Scripts/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs index 231e396fa..959d8cc12 100644 --- a/Scripts/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs +++ b/Scripts/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs @@ -10,9 +10,9 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; - public override bool CanBeBlessed{ get{ return false; } } + public override bool CanBeBlessed => false; [Constructible] public TheMostKnowledgePerson() : base( 0x2684 ) @@ -26,14 +26,14 @@ namespace Server.Items public TheMostKnowledgePerson( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs b/Scripts/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs index 2fa7ccc9e..0bcc40d38 100644 --- a/Scripts/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs +++ b/Scripts/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs @@ -12,7 +12,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public TheRobeOfBritanniaAri() : base( 0x2684 ) @@ -24,14 +24,14 @@ namespace Server.Items public TheRobeOfBritanniaAri( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/AcidProofRobe.cs b/Scripts/Items/Champion Artifacts/Unique/AcidProofRobe.cs index 3a5efa445..3ded5d2da 100644 --- a/Scripts/Items/Champion Artifacts/Unique/AcidProofRobe.cs +++ b/Scripts/Items/Champion Artifacts/Unique/AcidProofRobe.cs @@ -12,7 +12,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public AcidProofRobe() @@ -24,14 +24,14 @@ namespace Server.Items public AcidProofRobe( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/Calm.cs b/Scripts/Items/Champion Artifacts/Unique/Calm.cs index b0de7d680..4e66a57ac 100644 --- a/Scripts/Items/Champion Artifacts/Unique/Calm.cs +++ b/Scripts/Items/Champion Artifacts/Unique/Calm.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public Calm() @@ -35,7 +35,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs b/Scripts/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs index bd45448cb..ad68d7926 100644 --- a/Scripts/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs +++ b/Scripts/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs @@ -16,7 +16,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public CrownOfTalKeesh() @@ -31,14 +31,14 @@ namespace Server.Items public CrownOfTalKeesh( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/FangOfRactus.cs b/Scripts/Items/Champion Artifacts/Unique/FangOfRactus.cs index 1901cd9cf..280449067 100644 --- a/Scripts/Items/Champion Artifacts/Unique/FangOfRactus.cs +++ b/Scripts/Items/Champion Artifacts/Unique/FangOfRactus.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public FangOfRactus() @@ -36,7 +36,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/GladiatorsCollar.cs b/Scripts/Items/Champion Artifacts/Unique/GladiatorsCollar.cs index 876b08925..9b3e6a957 100644 --- a/Scripts/Items/Champion Artifacts/Unique/GladiatorsCollar.cs +++ b/Scripts/Items/Champion Artifacts/Unique/GladiatorsCollar.cs @@ -16,7 +16,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public GladiatorsCollar() @@ -32,14 +32,14 @@ namespace Server.Items public GladiatorsCollar( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs b/Scripts/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs index 531278fd2..8a0e84805 100644 --- a/Scripts/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs +++ b/Scripts/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs @@ -16,7 +16,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public OrcChieftainHelm() @@ -42,7 +42,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/Pacify.cs b/Scripts/Items/Champion Artifacts/Unique/Pacify.cs index 5b3cc33c2..1d36e96e5 100644 --- a/Scripts/Items/Champion Artifacts/Unique/Pacify.cs +++ b/Scripts/Items/Champion Artifacts/Unique/Pacify.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public Pacify() @@ -36,7 +36,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/Quell.cs b/Scripts/Items/Champion Artifacts/Unique/Quell.cs index 234d61367..3ecb94118 100644 --- a/Scripts/Items/Champion Artifacts/Unique/Quell.cs +++ b/Scripts/Items/Champion Artifacts/Unique/Quell.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public Quell() @@ -36,7 +36,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs b/Scripts/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs index f6fdc8e08..6d8e24a31 100644 --- a/Scripts/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs +++ b/Scripts/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs @@ -16,7 +16,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public ShroudOfDeciet() @@ -41,7 +41,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Unique/Subdue.cs b/Scripts/Items/Champion Artifacts/Unique/Subdue.cs index 17879d64b..216effeae 100644 --- a/Scripts/Items/Champion Artifacts/Unique/Subdue.cs +++ b/Scripts/Items/Champion Artifacts/Unique/Subdue.cs @@ -10,7 +10,7 @@ namespace Server.Items public override int InitMinHits{ get{ return 150; } } public override int InitMaxHits{ get{ return 150; } } - public override bool CanFortify{ get{ return false; } } + public override bool CanFortify => false; [Constructible] public Subdue() @@ -36,7 +36,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Clothing/OuterTorso.cs b/Scripts/Items/Clothing/OuterTorso.cs index 9ec21ae77..b7a337f33 100644 --- a/Scripts/Items/Clothing/OuterTorso.cs +++ b/Scripts/Items/Clothing/OuterTorso.cs @@ -616,7 +616,7 @@ namespace Server.Items StrRequirement = 0; } public override int LabelNumber{ get{ return 1076584; } } // A monk's robe - public override bool CanBeBlessed { get { return false; } } + public override bool CanBeBlessed => false; public override bool Dye( Mobile from, DyeTub sender ) { from.SendLocalizedMessage( sender.FailMessage ); @@ -756,7 +756,7 @@ namespace Server.Items Weight = 3.0; } - public override bool AllowFemaleWearer{ get{ return false; } } + public override bool AllowFemaleWearer => false; public MaleKimono( Serial serial ) : base( serial ) { @@ -791,7 +791,7 @@ namespace Server.Items Weight = 3.0; } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; public FemaleKimono( Serial serial ) : base( serial ) { @@ -862,7 +862,7 @@ namespace Server.Items Weight = 2.0; } - public override bool AllowMaleWearer{ get{ return false; } } + public override bool AllowMaleWearer => false; public FemaleElvenRobe( Serial serial ) : base( serial ) { @@ -882,4 +882,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Construction/Ankhs.cs b/Scripts/Items/Construction/Ankhs.cs index 9aaa17901..2c00821d8 100644 --- a/Scripts/Items/Construction/Ankhs.cs +++ b/Scripts/Items/Construction/Ankhs.cs @@ -120,7 +120,7 @@ namespace Server.Items { } - public override bool HandlesOnMovement{ get{ return true; } } // Tell the core that we implement OnMovement + public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -219,7 +219,7 @@ namespace Server.Items m_Item.Delete(); } - public override bool HandlesOnMovement{ get{ return true; } } // Tell the core that we implement OnMovement + public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -288,7 +288,7 @@ namespace Server.Items { } - public override bool HandlesOnMovement{ get{ return true; } } // Tell the core that we implement OnMovement + public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -389,7 +389,7 @@ namespace Server.Items m_Item.Delete(); } - public override bool HandlesOnMovement{ get{ return true; } } // Tell the core that we implement OnMovement + public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement public override void OnMovement( Mobile m, Point3D oldLocation ) { diff --git a/Scripts/Items/Construction/Doors/Portcullis.cs b/Scripts/Items/Construction/Doors/Portcullis.cs index 7477e4d71..0205f3596 100644 --- a/Scripts/Items/Construction/Doors/Portcullis.cs +++ b/Scripts/Items/Construction/Doors/Portcullis.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class PortcullisNS : BaseDoor { - public override bool UseChainedFunctionality{ get{ return true; } } + public override bool UseChainedFunctionality => true; [Constructible] public PortcullisNS() : base( 0x6F5, 0x6F5, 0xF0, 0xEF, new Point3D( 0, 0, 20 ) ) @@ -32,7 +32,7 @@ namespace Server.Items public class PortcullisEW : BaseDoor { - public override bool UseChainedFunctionality{ get{ return true; } } + public override bool UseChainedFunctionality => true; [Constructible] public PortcullisEW() : base( 0x6F6, 0x6F6, 0xF0, 0xEF, new Point3D( 0, 0, 20 ) ) @@ -57,4 +57,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Construction/Misc/Statues.cs b/Scripts/Items/Construction/Misc/Statues.cs index c1f2c4546..3d14582d4 100644 --- a/Scripts/Items/Construction/Misc/Statues.cs +++ b/Scripts/Items/Construction/Misc/Statues.cs @@ -1,325 +1,325 @@ -using System; - -namespace Server.Items -{ - public class StatueSouth : Item - { - [Constructible] - public StatueSouth() : base(0x139A) - { - Weight = 10; - } - - public StatueSouth(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - - int version = reader.ReadInt(); - } - } - - public class StatueSouth2 : Item - { - [Constructible] - public StatueSouth2() : base(0x1227) - { - Weight = 10; - } - - public StatueSouth2(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - - int version = reader.ReadInt(); - } - } - - public class StatueNorth : Item - { - [Constructible] - public StatueNorth() : base(0x139B) - { - Weight = 10; - } - - public StatueNorth(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - - int version = reader.ReadInt(); - } - } - - public class StatueWest : Item - { - [Constructible] - public StatueWest() : base(0x1226) - { - Weight = 10; - } - - public StatueWest(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - - int version = reader.ReadInt(); - } - } - - public class StatueEast : Item - { - [Constructible] - public StatueEast() : base(0x139C) - { - Weight = 10; - } - - public StatueEast(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - - int version = reader.ReadInt(); - } - } - - public class StatueEast2 : Item - { - [Constructible] - public StatueEast2() : base(0x1224) - { - Weight = 10; - } - - public StatueEast2(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - - int version = reader.ReadInt(); - } - } - - public class StatueSouthEast : Item - { - [Constructible] - public StatueSouthEast() : base(0x1225) - { - Weight = 10; - } - - public StatueSouthEast(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - - int version = reader.ReadInt(); - } - } - - public class BustSouth : Item - { - [Constructible] - public BustSouth() : base(0x12CB) - { - Weight = 10; - } - - public BustSouth(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } +using System; + +namespace Server.Items +{ + public class StatueSouth : Item + { + [Constructible] + public StatueSouth() : base(0x139A) + { + Weight = 10; + } + + public StatueSouth(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } + + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); + + int version = reader.ReadInt(); + } + } + + public class StatueSouth2 : Item + { + [Constructible] + public StatueSouth2() : base(0x1227) + { + Weight = 10; + } + + public StatueSouth2(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } + + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); + + int version = reader.ReadInt(); + } + } + + public class StatueNorth : Item + { + [Constructible] + public StatueNorth() : base(0x139B) + { + Weight = 10; + } + + public StatueNorth(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } + + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); + + int version = reader.ReadInt(); + } + } + + public class StatueWest : Item + { + [Constructible] + public StatueWest() : base(0x1226) + { + Weight = 10; + } + + public StatueWest(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } + + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); + + int version = reader.ReadInt(); + } + } + + public class StatueEast : Item + { + [Constructible] + public StatueEast() : base(0x139C) + { + Weight = 10; + } + + public StatueEast(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } + + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); + + int version = reader.ReadInt(); + } + } + + public class StatueEast2 : Item + { + [Constructible] + public StatueEast2() : base(0x1224) + { + Weight = 10; + } + + public StatueEast2(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } + + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); + + int version = reader.ReadInt(); + } + } + + public class StatueSouthEast : Item + { + [Constructible] + public StatueSouthEast() : base(0x1225) + { + Weight = 10; + } + + public StatueSouthEast(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } + + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); + + int version = reader.ReadInt(); + } + } + + public class BustSouth : Item + { + [Constructible] + public BustSouth() : base(0x12CB) + { + Weight = 10; + } + + public BustSouth(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); - int version = reader.ReadInt(); - } - } - - public class BustEast : Item - { - [Constructible] - public BustEast() : base(0x12CA) - { - Weight = 10; - } - - public BustEast(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } + int version = reader.ReadInt(); + } + } + + public class BustEast : Item + { + [Constructible] + public BustEast() : base(0x12CA) + { + Weight = 10; + } + + public BustEast(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); - int version = reader.ReadInt(); - } - } - - public class StatuePegasus : Item - { - [Constructible] - public StatuePegasus() : base(0x139D) - { - Weight = 10; - } - - public StatuePegasus(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - - writer.Write((int) 0); - } + int version = reader.ReadInt(); + } + } + + public class StatuePegasus : Item + { + [Constructible] + public StatuePegasus() : base(0x139D) + { + Weight = 10; + } + + public StatuePegasus(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); + + writer.Write((int) 0); + } - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); - int version = reader.ReadInt(); - } - } - - public class StatuePegasus2 : Item - { - [Constructible] - public StatuePegasus2() : base(0x1228) - { - Weight = 10; - } - - public StatuePegasus2(Serial serial) : base(serial) - { - } - - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); + int version = reader.ReadInt(); + } + } + + public class StatuePegasus2 : Item + { + [Constructible] + public StatuePegasus2() : base(0x1228) + { + Weight = 10; + } + + public StatuePegasus2(Serial serial) : base(serial) + { + } + + public override bool ForceShowProperties => ObjectPropertyList.Enabled; + + public override void Serialize(GenericWriter writer) + { + base.Serialize(writer); - writer.Write((int) 0); - } + writer.Write((int) 0); + } - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); + public override void Deserialize(GenericReader reader) + { + base.Deserialize(reader); - int version = reader.ReadInt(); - } - } + int version = reader.ReadInt(); + } + } public class SmallTowerSculpture : Item { @@ -347,4 +347,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Construction/Misc/Vines.cs b/Scripts/Items/Construction/Misc/Vines.cs index c53fd3dd2..173622c18 100644 --- a/Scripts/Items/Construction/Misc/Vines.cs +++ b/Scripts/Items/Construction/Misc/Vines.cs @@ -23,7 +23,7 @@ namespace Server.Items { } - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; public override void Serialize(GenericWriter writer) { @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Containers/FillableContainers.cs b/Scripts/Items/Containers/FillableContainers.cs index dbebffa72..9cce6f4cf 100644 --- a/Scripts/Items/Containers/FillableContainers.cs +++ b/Scripts/Items/Containers/FillableContainers.cs @@ -274,7 +274,7 @@ namespace Server.Items [Flippable( 0xA97, 0xA99, 0xA98, 0xA9A, 0xA9B, 0xA9C )] public class LibraryBookcase : FillableContainer { - public override bool IsLockable { get { return false; } } + public override bool IsLockable => false; public override int SpawnThreshold { get { return 5; } } protected override int GetSpawnCount() @@ -447,7 +447,7 @@ namespace Server.Items public class FillableBarrel : FillableContainer { - public override bool IsLockable { get { return false; } } + public override bool IsLockable => false; [Constructible] public FillableBarrel() @@ -1526,4 +1526,4 @@ namespace Server.Items return content; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Containers/LockableContainer.cs b/Scripts/Items/Containers/LockableContainer.cs index ec938b9fe..88ae8b011 100644 --- a/Scripts/Items/Containers/LockableContainer.cs +++ b/Scripts/Items/Containers/LockableContainer.cs @@ -267,7 +267,7 @@ namespace Server.Items return true; } - public override bool DisplaysContent{ get{ return !m_Locked; } } + public override bool DisplaysContent => !m_Locked; public virtual bool CheckLocked( Mobile from ) { @@ -410,4 +410,4 @@ namespace Server.Items #endregion } -} \ No newline at end of file +} diff --git a/Scripts/Items/Decoration Artifacts/BaseDecorationArtifact.cs b/Scripts/Items/Decoration Artifacts/BaseDecorationArtifact.cs index 4600749e0..11c3bd86b 100644 --- a/Scripts/Items/Decoration Artifacts/BaseDecorationArtifact.cs +++ b/Scripts/Items/Decoration Artifacts/BaseDecorationArtifact.cs @@ -7,7 +7,7 @@ namespace Server.Items { public abstract int ArtifactRarity{ get; } - public override bool ForceShowProperties{ get{ return true; } } + public override bool ForceShowProperties => true; public BaseDecorationArtifact( int itemID ) : base( itemID ) { @@ -44,7 +44,7 @@ namespace Server.Items { public abstract int ArtifactRarity{ get; } - public override bool ForceShowProperties{ get{ return true; } } + public override bool ForceShowProperties => true; public BaseDecorationContainerArtifact( int itemID ) : base( itemID ) { @@ -76,4 +76,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Deeds/ClothingBlessDeed.cs b/Scripts/Items/Deeds/ClothingBlessDeed.cs index abcc30fa0..7c00f2a76 100644 --- a/Scripts/Items/Deeds/ClothingBlessDeed.cs +++ b/Scripts/Items/Deeds/ClothingBlessDeed.cs @@ -94,7 +94,7 @@ namespace Server.Items int version = reader.ReadInt(); } - public override bool DisplayLootType{ get{ return false; } } + public override bool DisplayLootType => false; public override void OnDoubleClick( Mobile from ) // Override double click of the deed to call our target { @@ -107,6 +107,6 @@ namespace Server.Items from.SendLocalizedMessage( 1005018 ); // What would you like to bless? (Clothes Only) from.Target = new ClothingBlessTarget( this ); // Call our target } - } + } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Deeds/NewPlayerTicket.cs b/Scripts/Items/Deeds/NewPlayerTicket.cs index fe8978316..d7d887765 100644 --- a/Scripts/Items/Deeds/NewPlayerTicket.cs +++ b/Scripts/Items/Deeds/NewPlayerTicket.cs @@ -34,7 +34,7 @@ namespace Server.Items list.Add( 1041492 ); // This is half a prize ticket! Double-click this ticket and target any other ticket marked NEW PLAYER and get a prize! This ticket will only work for YOU, so don't give it away! } - public override bool DisplayLootType{ get{ return false; } } + public override bool DisplayLootType => false; public NewPlayerTicket( Serial serial ) : base( serial ) { @@ -195,4 +195,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Facial/Beard.cs b/Scripts/Items/Facial/Beard.cs index 8129dfd83..9c083eacd 100644 --- a/Scripts/Items/Facial/Beard.cs +++ b/Scripts/Items/Facial/Beard.cs @@ -34,7 +34,7 @@ namespace Server.Items { } - public override bool DisplayLootType{ get{ return false; } } + public override bool DisplayLootType => false; public override bool VerifyMove( Mobile from ) { @@ -69,12 +69,12 @@ namespace Server.Items public class GenericBeard : Beard { - + private GenericBeard( int itemID ) : this( itemID, 0 ) { } - + private GenericBeard( int itemID, int hue ) : base( itemID, hue ) { } @@ -327,4 +327,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Facial/Hair.cs b/Scripts/Items/Facial/Hair.cs index fc3797545..e0542ddc3 100644 --- a/Scripts/Items/Facial/Hair.cs +++ b/Scripts/Items/Facial/Hair.cs @@ -5,7 +5,7 @@ namespace Server.Items public abstract class Hair : Item { /* - + public static Hair GetRandomHair( bool female ) { return GetRandomHair( female, Utility.RandomHairHue() ); @@ -82,7 +82,7 @@ namespace Server.Items { } - public override bool DisplayLootType { get { return false; } } + public override bool DisplayLootType => false; public override bool VerifyMove( Mobile from ) { @@ -488,4 +488,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Food/Beverage.cs b/Scripts/Items/Food/Beverage.cs index b5e5b88a6..07e001b3e 100644 --- a/Scripts/Items/Food/Beverage.cs +++ b/Scripts/Items/Food/Beverage.cs @@ -36,7 +36,7 @@ namespace Server.Items { public override int BaseLabelNumber { get { return 1042959; } } // a bottle of Ale public override int MaxQuantity { get { return 5; } } - public override bool Fillable { get { return false; } } + public override bool Fillable => false; public override int ComputeItemID() { @@ -115,7 +115,7 @@ namespace Server.Items { public override int BaseLabelNumber { get { return 1042965; } } // a jug of Ale public override int MaxQuantity { get { return 10; } } - public override bool Fillable { get { return false; } } + public override bool Fillable => false; public override int ComputeItemID() { @@ -1026,7 +1026,7 @@ namespace Server.Items else if( targ is BaseWaterContainer ) { BaseWaterContainer bwc = targ as BaseWaterContainer; - + if( Content != BeverageType.Water ) { from.SendLocalizedMessage( 500842 ); // Can't pour that in there. @@ -1036,7 +1036,7 @@ namespace Server.Items from.SendLocalizedMessage( 500841 ); // That has something in it. } else - { + { int itNeeds = Math.Min( ( bwc.MaxQuantity - bwc.Quantity ), Quantity ); if( itNeeds > 0 ) @@ -1230,4 +1230,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/BaseBoard.cs b/Scripts/Items/Games/BaseBoard.cs index 2956b2446..9ec0c39d9 100644 --- a/Scripts/Items/Games/BaseBoard.cs +++ b/Scripts/Items/Games/BaseBoard.cs @@ -47,9 +47,9 @@ namespace Server.Items piece.Location = new Point3D( x, y, 0 ); } - public override bool DisplaysContent{ get{ return false; } } // Do not display (x items, y stones) + public override bool DisplaysContent => false; // Do not display (x items, y stones) - public override bool IsDecoContainer{ get{ return false; } } + public override bool IsDecoContainer => false; public BaseBoard( Serial serial ) : base( serial ) { @@ -166,4 +166,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/BasePiece.cs b/Scripts/Items/Games/BasePiece.cs index d22b06fb9..b8c9d1e11 100644 --- a/Scripts/Items/Games/BasePiece.cs +++ b/Scripts/Items/Games/BasePiece.cs @@ -13,7 +13,7 @@ namespace Server.Items set { m_Board = value; } } - public override bool IsVirtualItem{ get{ return true; } } + public override bool IsVirtualItem => true; public BasePiece( int itemID, BaseBoard board ) : base( itemID ) { @@ -80,7 +80,7 @@ namespace Server.Items } } - public override bool CanTarget{ get{ return false; } } + public override bool CanTarget => false; public override bool DropToMobile( Mobile from, Mobile target, Point3D p ) { @@ -102,4 +102,4 @@ namespace Server.Items return -1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Guilds/GuildTeleporter.cs b/Scripts/Items/Guilds/GuildTeleporter.cs index 9e87e0dde..6f558f81f 100644 --- a/Scripts/Items/Guilds/GuildTeleporter.cs +++ b/Scripts/Items/Guilds/GuildTeleporter.cs @@ -30,7 +30,7 @@ namespace Server.Items { } - public override bool DisplayLootType{ get{ return false; } } + public override bool DisplayLootType => false; public override void Serialize( GenericWriter writer ) { @@ -102,4 +102,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/BloodwoodSpirit.cs b/Scripts/Items/Minor Artifacts/ML/BloodwoodSpirit.cs index ecbc50d37..1db481fba 100644 --- a/Scripts/Items/Minor Artifacts/ML/BloodwoodSpirit.cs +++ b/Scripts/Items/Minor Artifacts/ML/BloodwoodSpirit.cs @@ -6,7 +6,7 @@ namespace Server.Items public class BloodwoodSpirit : BaseTalisman { public override int LabelNumber{ get{ return 1075034; } } // Bloodwood Spirit - public override bool ForceShowName{ get{ return true; } } + public override bool ForceShowName => true; [Constructible] public BloodwoodSpirit() : base( 0x2F5A ) diff --git a/Scripts/Items/Minor Artifacts/ML/TotemOfVoid.cs b/Scripts/Items/Minor Artifacts/ML/TotemOfVoid.cs index 23efb2f2f..4687e5218 100644 --- a/Scripts/Items/Minor Artifacts/ML/TotemOfVoid.cs +++ b/Scripts/Items/Minor Artifacts/ML/TotemOfVoid.cs @@ -7,7 +7,7 @@ namespace Server.Items public class TotemOfVoid : BaseTalisman { public override int LabelNumber{ get{ return 1075035; } } // Totem of the Void - public override bool ForceShowName{ get{ return true; } } + public override bool ForceShowName => true; [Constructible] public TotemOfVoid() : base( 0x2F5B ) diff --git a/Scripts/Items/Minor Artifacts/PhillipsWoodenSteed.cs b/Scripts/Items/Minor Artifacts/PhillipsWoodenSteed.cs index fe7659512..6c316b65f 100644 --- a/Scripts/Items/Minor Artifacts/PhillipsWoodenSteed.cs +++ b/Scripts/Items/Minor Artifacts/PhillipsWoodenSteed.cs @@ -11,7 +11,7 @@ namespace Server.Items LootType = LootType.Regular; } - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; public PhillipsWoodenSteed( Serial serial ) : base( serial ) { @@ -23,7 +23,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/BankCheck.cs b/Scripts/Items/Misc/BankCheck.cs index 662960964..c3d436381 100644 --- a/Scripts/Items/Misc/BankCheck.cs +++ b/Scripts/Items/Misc/BankCheck.cs @@ -62,7 +62,7 @@ namespace Server.Items m_Worth = worth; } - public override bool DisplayLootType{ get{ return Core.AOS; } } + public override bool DisplayLootType => Core.AOS; public override int LabelNumber{ get{ return 1041361; } } // A bank check diff --git a/Scripts/Items/Misc/Corpses/Corpse.cs b/Scripts/Items/Misc/Corpses/Corpse.cs index 0aaa5fb06..c1857585e 100644 --- a/Scripts/Items/Misc/Corpses/Corpse.cs +++ b/Scripts/Items/Misc/Corpses/Corpse.cs @@ -265,7 +265,7 @@ namespace Server.Items set{ m_TimeOfDeath = value; } } - public override bool DisplayWeight { get { return false; } } + public override bool DisplayWeight => false; public HairInfo Hair { get { return m_Hair; } } public FacialHairInfo FacialHair { get { return m_FacialHair; } } @@ -528,7 +528,7 @@ namespace Server.Items } // Why was this public? - // public override bool IsPublicContainer{ get{ return true; } } + // public override bool IsPublicContainer => true; public Corpse( Mobile owner, List equipItems ) : this( owner, null, null, equipItems ) { @@ -1209,7 +1209,7 @@ namespace Server.Items return false; } - public override bool DisplaysContent{ get{ return false; } } + public override bool DisplaysContent => false; public override void AddNameProperty( ObjectPropertyList list ) { @@ -1302,4 +1302,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Corpses/DecayedCorpse.cs b/Scripts/Items/Misc/Corpses/DecayedCorpse.cs index 6d99b0e92..9676e1537 100644 --- a/Scripts/Items/Misc/Corpses/DecayedCorpse.cs +++ b/Scripts/Items/Misc/Corpses/DecayedCorpse.cs @@ -60,7 +60,7 @@ namespace Server.Items } // Do not display (x items, y stones) - public override bool DisplaysContent{ get{ return false; } } + public override bool DisplaysContent => false; public override void AddNameProperty( ObjectPropertyList list ) { @@ -112,4 +112,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/DeceitBrazier.cs b/Scripts/Items/Misc/DeceitBrazier.cs index 38650270d..fea8514dc 100644 --- a/Scripts/Items/Misc/DeceitBrazier.cs +++ b/Scripts/Items/Misc/DeceitBrazier.cs @@ -63,7 +63,7 @@ namespace Server.Items #endregion #region Random Critters - typeof( Sewerrat ), typeof( GiantRat ), typeof( DireWolf ), typeof( TimberWolf ), + typeof( SewerRat ), typeof( GiantRat ), typeof( DireWolf ), typeof( TimberWolf ), typeof( Cougar ), typeof( Alligator ) #endregion }; @@ -89,7 +89,7 @@ namespace Server.Items [Constructible] public DeceitBrazier() : base( 0xE31 ) { - Movable = false; + Movable = false; Light = LightType.Circle225; m_NextSpawn = DateTime.UtcNow; m_NextSpawnDelay = TimeSpan.FromMinutes( 15.0 ); @@ -130,7 +130,7 @@ namespace Server.Items PublicOverheadMessage( MessageType.Regular, 0x3B2, 500761 );// Heed this warning well, and use this brazier at your own peril. } - public override bool HandlesOnMovement { get { return true; } } + public override bool HandlesOnMovement => true; public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -223,4 +223,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/EffectController.cs b/Scripts/Items/Misc/EffectController.cs index 8ebc50152..2867c87ec 100644 --- a/Scripts/Items/Misc/EffectController.cs +++ b/Scripts/Items/Misc/EffectController.cs @@ -161,7 +161,7 @@ namespace Server.Items DoEffect( from ); } - public override bool HandlesOnMovement{ get{ return ( m_TriggerType == EffectTriggerType.InRange ); } } + public override bool HandlesOnMovement => ( m_TriggerType == EffectTriggerType.InRange ); public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -336,4 +336,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/MorphItem.cs b/Scripts/Items/Misc/MorphItem.cs index 012ad6f93..d27730561 100644 --- a/Scripts/Items/Misc/MorphItem.cs +++ b/Scripts/Items/Misc/MorphItem.cs @@ -60,7 +60,7 @@ namespace Server.Items { } - public override bool HandlesOnMovement{ get{ return true; } } + public override bool HandlesOnMovement => true; public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -143,4 +143,4 @@ namespace Server.Items Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Refresh ) ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/PowerGenerator.cs b/Scripts/Items/Misc/PowerGenerator.cs index 117f24425..7dc847120 100644 --- a/Scripts/Items/Misc/PowerGenerator.cs +++ b/Scripts/Items/Misc/PowerGenerator.cs @@ -24,7 +24,7 @@ namespace Server.Items AddComponent( new ControlPanel( sideLength ), 1, 0, -2 ); } - public override bool ShareHue{ get{ return false; } } + public override bool ShareHue => false; private void AddGeneratorComponent( int itemID, int x, int y, int z ) { @@ -568,4 +568,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs b/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs index a78cb69e3..80de80ffd 100644 --- a/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs +++ b/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs @@ -6,7 +6,7 @@ namespace Server.Items public class ShimmeringCrystals : Item { public override int LabelNumber{ get{ return 1075095; } } // Shimmering Crystals - public override bool ForceShowProperties{ get{ return true; } } + public override bool ForceShowProperties => true; private static readonly int[] m_ItemIDs = new int[] { diff --git a/Scripts/Items/Misc/PublicMoongate.cs b/Scripts/Items/Misc/PublicMoongate.cs index 7b7b1ef5a..90e31899d 100644 --- a/Scripts/Items/Misc/PublicMoongate.cs +++ b/Scripts/Items/Misc/PublicMoongate.cs @@ -11,7 +11,7 @@ namespace Server.Items { public class PublicMoongate : Item { - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; [Constructible] public PublicMoongate() : base( 0xF6C ) @@ -44,7 +44,7 @@ namespace Server.Items return true; } - public override bool HandlesOnMovement{ get{ return true; } } + public override bool HandlesOnMovement => true; public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -467,4 +467,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/SerpentPillar.cs b/Scripts/Items/Misc/SerpentPillar.cs index 4a72454aa..163f60e1b 100644 --- a/Scripts/Items/Misc/SerpentPillar.cs +++ b/Scripts/Items/Misc/SerpentPillar.cs @@ -49,7 +49,7 @@ namespace Server.Items m_Destination = destination; } - public override bool HandlesOnSpeech{ get{ return true; } } + public override bool HandlesOnSpeech => true; public override void OnSpeech( SpeechEventArgs e ) { @@ -123,4 +123,4 @@ namespace Server.Items m_Destination = reader.ReadRect2D(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Teleporter.cs b/Scripts/Items/Misc/Teleporter.cs index b005ee0bf..ad5676ba5 100644 --- a/Scripts/Items/Misc/Teleporter.cs +++ b/Scripts/Items/Misc/Teleporter.cs @@ -448,7 +448,7 @@ namespace Server.Items set { m_Range = value; InvalidateProperties(); } } - public override bool HandlesOnSpeech { get { return true; } } + public override bool HandlesOnSpeech => true; public override void OnSpeech(SpeechEventArgs e) { diff --git a/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs b/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs index efac2bd80..d073f737f 100644 --- a/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs +++ b/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs @@ -5,7 +5,7 @@ namespace Server.Items public class TaintedMushroom : Item { public override int LabelNumber{ get{ return 1075088; } } // Dread Horn Tainted Mushroom - public override bool ForceShowProperties{ get{ return true; } } + public override bool ForceShowProperties => true; [Constructible] public TaintedMushroom() : base( Utility.RandomMinMax( 0x222E, 0x2231 ) ) diff --git a/Scripts/Items/Misc/WarningItem.cs b/Scripts/Items/Misc/WarningItem.cs index 6c840caf2..c379287d2 100644 --- a/Scripts/Items/Misc/WarningItem.cs +++ b/Scripts/Items/Misc/WarningItem.cs @@ -127,7 +127,7 @@ namespace Server.Items m_Broadcasting = false; } - public override bool HandlesOnMovement{ get{ return true; } } + public override bool HandlesOnMovement => true; public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -188,7 +188,7 @@ namespace Server.Items set{ m_HintNumber = value; } } - public override bool OnlyToTriggerer{ get{ return true; } } + public override bool OnlyToTriggerer => true; [Constructible] public HintItem( int itemID, int range, int warning, int hint ) : base( itemID, range, warning ) @@ -239,4 +239,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/WindChimes.cs b/Scripts/Items/Misc/WindChimes.cs index 9e655c442..8ec8e0d27 100644 --- a/Scripts/Items/Misc/WindChimes.cs +++ b/Scripts/Items/Misc/WindChimes.cs @@ -29,7 +29,7 @@ namespace Server.Items get{ return m_Sounds; } } - public override bool HandlesOnMovement{ get{ return m_TurnedOn && IsLockedDown; } } + public override bool HandlesOnMovement => m_TurnedOn && IsLockedDown; public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -186,4 +186,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/New Haven Quest Rewards/HammerOfHephaestus.cs b/Scripts/Items/New Haven Quest Rewards/HammerOfHephaestus.cs index 0708de3bb..1857d3cb7 100644 --- a/Scripts/Items/New Haven Quest Rewards/HammerOfHephaestus.cs +++ b/Scripts/Items/New Haven Quest Rewards/HammerOfHephaestus.cs @@ -21,7 +21,7 @@ namespace Server.Items StartRechargeTimer(); } - public override bool BreakOnDepletion { get { return false; } } + public override bool BreakOnDepletion => false; /* Note: * On EA, it also leaves the crafting gump open when it reaches 0 charges. * When crafting again, only then the crafting gump closes with the 1072306 system message. diff --git a/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs index fa7dda2df..421436f9e 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs @@ -13,7 +13,7 @@ namespace Server.Items public abstract int MinDamage{ get; } public abstract int MaxDamage{ get; } - public override bool RequireFreeHand{ get{ return false; } } + public override bool RequireFreeHand => false; public BaseConflagrationPotion( PotionEffect effect ) : base( 0xF06, effect ) { @@ -82,7 +82,7 @@ namespace Server.Items return; Consume(); - + // Check if any other players are using this potion for ( int i = 0; i < m_Users.Count; i ++ ) { @@ -117,7 +117,7 @@ namespace Server.Items if ( timer != null ) timer.Stop(); - m_Delay[ m ] = Timer.DelayCall( TimeSpan.FromSeconds( 30 ), new TimerStateCallback( EndDelay_Callback ), m ); + m_Delay[ m ] = Timer.DelayCall( TimeSpan.FromSeconds( 30 ), new TimerStateCallback( EndDelay_Callback ), m ); } public static int GetDelay( Mobile m ) @@ -166,7 +166,7 @@ namespace Server.Items { if ( m_Potion.Deleted || m_Potion.Map == Map.Internal ) return; - + IPoint3D p = targeted as IPoint3D; if ( p == null || from.Map == null ) @@ -201,7 +201,7 @@ namespace Server.Items public Mobile From{ get{ return m_From; } } - public override bool BlocksFit{ get{ return true; } } + public override bool BlocksFit => true; public InternalItem( Mobile from, Point3D loc, Map map, int min, int max ) : base( 0x398C ) { @@ -269,7 +269,7 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadInt(); - + m_From = reader.ReadMobile(); m_End = reader.ReadDateTime(); m_MinDamage = reader.ReadInt(); @@ -321,7 +321,7 @@ namespace Server.Items if ( m_Item.Map == null || from == null ) return; - + List mobiles = new List(); foreach( Mobile mobile in m_Item.GetMobilesInRange( 0 ) ) @@ -330,15 +330,15 @@ namespace Server.Items for( int i = 0; i < mobiles.Count; i++ ) { Mobile m = mobiles[i]; - + if ( (m.Z + 16) > m_Item.Z && (m_Item.Z + 12) > m.Z && (!Core.AOS || m != from) && SpellHelper.ValidIndirectTarget( from, m ) && from.CanBeHarmful( m, false ) ) { if ( from != null ) from.DoHarmful( m ); - + AOS.Damage( m, from, m_Item.GetDamage(), 0, 100, 0, 0, 0 ); m.PlaySound( 0x208 ); - } + } } } } diff --git a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs index 367375f9f..7ce1d87da 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs @@ -14,7 +14,7 @@ namespace Server.Items { public abstract int Radius{ get; } - public override bool RequireFreeHand{ get{ return false; } } + public override bool RequireFreeHand => false; public BaseConfusionBlastPotion( PotionEffect effect ) : base( 0xF06, effect ) { @@ -120,11 +120,11 @@ namespace Server.Items if ( map.CanFit( p, 12, true, false ) ) Effects.SendLocationEffect( p, map, 0x376A, 4, 9 ); } - + public void CircleEffect2( object state ) { object[] states = (object[]) state; - + Geometry.Circle2D( (Point3D)states[0], (Map)states[1], Radius, new DoEffect_Callback( BlastEffect ), 90, 270 ); } #endregion @@ -139,7 +139,7 @@ namespace Server.Items if ( timer != null ) timer.Stop(); - m_Delay[ m ] = Timer.DelayCall( TimeSpan.FromSeconds( 60 ), new TimerStateCallback( EndDelay_Callback ), m ); + m_Delay[ m ] = Timer.DelayCall( TimeSpan.FromSeconds( 60 ), new TimerStateCallback( EndDelay_Callback ), m ); } public static int GetDelay( Mobile m ) @@ -168,7 +168,7 @@ namespace Server.Items m_Delay.Remove( m ); } } - #endregion + #endregion private class ThrowTarget : Target { diff --git a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs index da6adbc6c..18deb21e2 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs @@ -13,7 +13,7 @@ namespace Server.Items public abstract int MinDamage { get; } public abstract int MaxDamage { get; } - public override bool RequireFreeHand{ get{ return false; } } + public override bool RequireFreeHand => false; private static bool LeveledExplosion = false; // Should explosion potions explode other nearby potions? private static bool InstantExplosion = false; // Should explosion potions explode on impact? @@ -207,7 +207,7 @@ namespace Server.Items if( p is Mobile ) { - if( !RelativeLocation ) // explosion location = current mob location. + if( !RelativeLocation ) // explosion location = current mob location. p = ((Mobile)p).Location; else to = (Mobile)p; @@ -287,7 +287,7 @@ namespace Server.Items from.DoHarmful( m ); int damage = Utility.RandomMinMax( min, max ); - + damage += alchemyBonus; if ( !Core.AOS && damage > 40 ) diff --git a/Scripts/Items/Skill Items/Magical/Runebook.cs b/Scripts/Items/Skill Items/Magical/Runebook.cs index 6d12a5315..41379e899 100644 --- a/Scripts/Items/Skill Items/Magical/Runebook.cs +++ b/Scripts/Items/Skill Items/Magical/Runebook.cs @@ -16,8 +16,8 @@ namespace Server.Items public static readonly TimeSpan UseDelay = TimeSpan.FromSeconds( 7.0 ); private BookQuality m_Quality; - - [CommandProperty( AccessLevel.GameMaster )] + + [CommandProperty( AccessLevel.GameMaster )] public BookQuality Quality { get{ return m_Quality; } @@ -30,9 +30,9 @@ namespace Server.Items private int m_DefaultIndex; private SecureLevel m_Level; private Mobile m_Crafter; - + private DateTime m_NextUse; - + private List m_Openers = new List(); [CommandProperty( AccessLevel.GameMaster )] @@ -95,7 +95,7 @@ namespace Server.Items m_MaxCharges = value; } } - + public List Openers { get @@ -180,7 +180,7 @@ namespace Server.Items writer.Write( (int) 3 ); - writer.Write( (byte) m_Quality ); + writer.Write( (byte) m_Quality ); writer.Write( m_Crafter ); @@ -212,7 +212,7 @@ namespace Server.Items { case 3: { - m_Quality = (BookQuality) reader.ReadByte(); + m_Quality = (BookQuality) reader.ReadByte(); goto case 2; } case 2: @@ -283,7 +283,7 @@ namespace Server.Items return false; } - public override bool DisplayLootType{ get{ return Core.AOS; } } + public override bool DisplayLootType => Core.AOS; public override void GetProperties( ObjectPropertyList list ) { @@ -298,7 +298,7 @@ namespace Server.Items if ( m_Description != null && m_Description.Length > 0 ) list.Add( m_Description ); } - + public override bool OnDragLift( Mobile from ) { if ( from.HasGump( typeof( RunebookGump ) ) ) @@ -306,13 +306,13 @@ namespace Server.Items from.SendLocalizedMessage( 500169 ); // You cannot pick that up. return false; } - + foreach ( Mobile m in m_Openers ) if ( IsOpen( m ) ) m.CloseGump( typeof( RunebookGump ) ); - + m_Openers.Clear(); - + return true; } @@ -345,7 +345,7 @@ namespace Server.Items from.CloseGump( typeof( RunebookGump ) ); from.SendGump( new RunebookGump( from, this ) ); - + m_Openers.Add( from ); } } @@ -555,4 +555,4 @@ namespace Server.Items writer.Write( m_Description ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Spellbook.cs b/Scripts/Items/Skill Items/Magical/Spellbook.cs index cd9a7496b..e9647e680 100644 --- a/Scripts/Items/Skill Items/Magical/Spellbook.cs +++ b/Scripts/Items/Skill Items/Magical/Spellbook.cs @@ -31,15 +31,15 @@ namespace Server.Items { private string m_EngravedText; private BookQuality m_Quality; - - [CommandProperty( AccessLevel.GameMaster )] + + [CommandProperty( AccessLevel.GameMaster )] public string EngravedText { get{ return m_EngravedText; } set{ m_EngravedText = value; InvalidateProperties(); } } - - [CommandProperty( AccessLevel.GameMaster )] + + [CommandProperty( AccessLevel.GameMaster )] public BookQuality Quality { get{ return m_Quality; } @@ -135,7 +135,7 @@ namespace Server.Items else { Spell spell = SpellRegistry.NewSpell( spellID, from, null ); - + if ( spell != null ) spell.Cast(); else @@ -299,7 +299,7 @@ namespace Server.Items return ( book.SpellbookType == type && ( spellID == -1 || book.HasSpell( spellID ) ) ); } - public override bool DisplayWeight { get { return false; } } + public override bool DisplayWeight => false; private AosAttributes m_AosAttributes; private AosSkillBonuses m_AosSkillBonuses; @@ -582,21 +582,21 @@ namespace Server.Items set{ m_Crafter = value; InvalidateProperties(); } } - public override bool DisplayLootType{ get{ return Core.AOS; } } + public override bool DisplayLootType => Core.AOS; public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_Quality == BookQuality.Exceptional ) list.Add( 1063341 ); // exceptional - + if ( m_EngravedText != null ) list.Add( 1072305, m_EngravedText ); // Engraved: ~1_INSCRIPTION~ if ( m_Crafter != null ) list.Add( 1050043, m_Crafter.Name ); // crafted by ~1_NAME~ - + m_AosSkillBonuses.GetProperties( list ); if( m_Slayer != SlayerName.None ) @@ -735,9 +735,9 @@ namespace Server.Items writer.Write( (int) 5 ); // version - writer.Write( (byte) m_Quality ); - - writer.Write( (string) m_EngravedText ); + writer.Write( (byte) m_Quality ); + + writer.Write( (string) m_EngravedText ); writer.Write( m_Crafter ); @@ -761,13 +761,13 @@ namespace Server.Items { case 5: { - m_Quality = (BookQuality) reader.ReadByte(); + m_Quality = (BookQuality) reader.ReadByte(); goto case 4; } case 4: { - m_EngravedText = reader.ReadString(); + m_EngravedText = reader.ReadString(); goto case 3; } @@ -917,4 +917,4 @@ namespace Server.Items return quality; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Misc/RepairDeed.cs b/Scripts/Items/Skill Items/Misc/RepairDeed.cs index 9ccfcb634..9b321bfa9 100644 --- a/Scripts/Items/Skill Items/Misc/RepairDeed.cs +++ b/Scripts/Items/Skill Items/Misc/RepairDeed.cs @@ -64,9 +64,9 @@ namespace Server.Items Fletching } - public override bool DisplayLootType { get { return false; } } + public override bool DisplayLootType => false; - private RepairSkillType m_Skill; + private RepairSkillType m_Skill; private double m_SkillLevel; private Mobile m_Crafter; diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs index c529b200b..d32518b32 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs @@ -4,8 +4,8 @@ namespace Server.Items { public class FurnitureDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem { - public override bool AllowDyables{ get{ return false; } } - public override bool AllowFurniture{ get{ return true; } } + 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 @@ -73,4 +73,4 @@ namespace Server.Items LootType = LootType.Blessed; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs index a4b3d8e24..ebac46890 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs @@ -4,8 +4,8 @@ namespace Server.Items { public class LeatherDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem { - public override bool AllowDyables{ get{ return false; } } - public override bool AllowLeather{ get{ return true; } } + 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 @@ -71,4 +71,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs index a2a2f380d..0b267b1b4 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs @@ -4,9 +4,9 @@ namespace Server.Items { public class MetallicClothDyetub : DyeTub { - public override int LabelNumber { get { return 1152920; } } // Metallic Cloth ... + public override int LabelNumber { get { return 1152920; } } // Metallic Cloth ... - public override bool MetallicHues { get { return true; } } + public override bool MetallicHues => true; [Constructible] public MetallicClothDyetub() @@ -33,4 +33,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs index 22ae9270d..e3d4f7bd3 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs @@ -6,9 +6,9 @@ namespace Server.Items { public override CustomHuePicker CustomHuePicker{ get{ return null; } } - public override int LabelNumber { get { return 1153495; } } // Metallic Leather ... + public override int LabelNumber { get { return 1153495; } } // Metallic Leather ... - public override bool MetallicHues { get { return true; } } + public override bool MetallicHues => true; [Constructible] public MetallicLeatherDyeTub() @@ -43,4 +43,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs index b757ac6aa..639d70135 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs @@ -4,8 +4,8 @@ namespace Server.Items { public class RunebookDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem { - public override bool AllowDyables{ get{ return false; } } - public override bool AllowRunebooks{ get{ return true; } } + 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 @@ -71,4 +71,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs index 2fe5c4fec..c2762dd29 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs @@ -4,8 +4,8 @@ namespace Server.Items { public class StatuetteDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem { - public override bool AllowDyables{ get{ return false; } } - public override bool AllowStatuettes{ get{ return true; } } + 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 @@ -71,4 +71,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs index 6b6a524a5..7fb5d1976 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs @@ -7,7 +7,7 @@ namespace Server.Items /* High seas, loot from merchant ship's hold, also a "unc { public override int LabelNumber { get { return 1149984; } } // White Cloth Dye Tub - public override bool Redyable { get { return false; } } + public override bool Redyable => false; [Constructible] public WhiteClothDyeTub() @@ -34,4 +34,4 @@ namespace Server.Items /* High seas, loot from merchant ship's hold, also a "unc int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs index d3fb4ef6e..35fb302ad 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs @@ -7,7 +7,7 @@ namespace Server.Items { public override int LabelNumber { get { return 1149900; } } // White Leather Dye Tub - public override bool Redyable { get { return false; } } + public override bool Redyable => false; [Constructible] public WhiteLeatherDyeTub() @@ -36,4 +36,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs b/Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs index 1b82f979c..cf2280722 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs @@ -8,7 +8,7 @@ namespace Server.Items public class CreepyPortraitComponent : AddonComponent { public override int LabelNumber { get { return 1074481; } } // Creepy portrait - public override bool HandlesOnMovement { get { return true; } } + public override bool HandlesOnMovement => true; public CreepyPortraitComponent() : base( 0x2A69 ) { @@ -71,7 +71,7 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + if ( version == 0 && ItemID != 0x2A69 && ItemID != 0x2A6D ) ItemID = 0x2A69; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/HauntedMirror.cs b/Scripts/Items/Special/Evil Home Decor Collection/HauntedMirror.cs index d517f816a..1129c53b5 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/HauntedMirror.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/HauntedMirror.cs @@ -6,7 +6,7 @@ namespace Server.Items public class HaunterMirrorComponent : AddonComponent { public override int LabelNumber { get { return 1074800; } } // Haunted Mirror - public override bool HandlesOnMovement { get { return true; } } + public override bool HandlesOnMovement => true; public HaunterMirrorComponent() : base( 0x2A7B ) { diff --git a/Scripts/Items/Special/Heritage Items/Curtains.cs b/Scripts/Items/Special/Heritage Items/Curtains.cs index 35af80b56..9ed907d2f 100644 --- a/Scripts/Items/Special/Heritage Items/Curtains.cs +++ b/Scripts/Items/Special/Heritage Items/Curtains.cs @@ -8,7 +8,7 @@ namespace Server.Items public class CurtainsComponent : AddonComponent, IDyable { public override int LabelNumber { get { return 1076280; } } // Curtains - public override bool DisplayWeight { get { return false; } } + public override bool DisplayWeight => false; private int m_ClosedID; @@ -86,7 +86,7 @@ namespace Server.Items public class CurtainsAddon : BaseAddon { public override BaseAddonDeed Deed { get { return new CurtainsDeed(); } } - public override bool RetainDeedHue { get { return true; } } + public override bool RetainDeedHue => true; [Constructible] public CurtainsAddon( bool east ) : base() diff --git a/Scripts/Items/Special/ML/GrizzledMareStatuette.cs b/Scripts/Items/Special/ML/GrizzledMareStatuette.cs index bfbf3a9de..8fd2fa5e7 100644 --- a/Scripts/Items/Special/ML/GrizzledMareStatuette.cs +++ b/Scripts/Items/Special/ML/GrizzledMareStatuette.cs @@ -8,7 +8,7 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1074475; } } // Grizzled Mare Statuette public override BaseCreature Summon{ get { return new GrizzledMare(); } } - + [Constructible] public GrizzledMareStatuette() : base( 0x2617 ) { @@ -22,14 +22,14 @@ namespace Server.Items public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); - + writer.Write( (int) 0 ); // version } public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); - + int version = reader.ReadInt(); } } @@ -39,7 +39,7 @@ namespace Server.Mobiles { public class GrizzledMare : HellSteed { - public override bool DeleteOnRelease { get { return true; } } + public override bool DeleteOnRelease => true; private static readonly string m_Myname = "a grizzled mare"; @@ -59,18 +59,18 @@ namespace Server.Mobiles public GrizzledMare( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); - + writer.Write( (int) 1 ); // version } public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); - + int version = reader.ReadInt(); if( version < 1 ) diff --git a/Scripts/Items/Special/ML/MinotaurHedge.cs b/Scripts/Items/Special/ML/MinotaurHedge.cs index 1c9f3b3fd..3740f75e6 100644 --- a/Scripts/Items/Special/ML/MinotaurHedge.cs +++ b/Scripts/Items/Special/ML/MinotaurHedge.cs @@ -5,29 +5,29 @@ namespace Server.Items { public class MinotaurHedge : Item { - + public override string DefaultName => "minotaur hedge"; + [Constructible] public MinotaurHedge() : base( Utility.Random( 3215, 4 ) ) { - Name = "minotaur hedge"; - Weight = 1.0; + Weight = 1.0; } public MinotaurHedge( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); - + writer.Write( (int) 0 ); // version } public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); - + int version = reader.ReadInt(); } } diff --git a/Scripts/Items/Special/ML/TormentedChains.cs b/Scripts/Items/Special/ML/TormentedChains.cs index 96951ff51..95310cbd5 100644 --- a/Scripts/Items/Special/ML/TormentedChains.cs +++ b/Scripts/Items/Special/ML/TormentedChains.cs @@ -5,29 +5,29 @@ namespace Server.Items { public class TormentedChains : Item { - + public override string DefaultName => "chains of the tormented"; + [Constructible] public TormentedChains() : base( Utility.Random( 6663, 2 ) ) { - Name = "chains of the tormented"; - Weight = 1.0; + Weight = 1.0; } public TormentedChains( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); - + writer.Write( (int) 0 ); // version } public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); - + int version = reader.ReadInt(); } } diff --git a/Scripts/Items/Special/MonsterStatuette.cs b/Scripts/Items/Special/MonsterStatuette.cs index ca7df481c..88b15ed88 100644 --- a/Scripts/Items/Special/MonsterStatuette.cs +++ b/Scripts/Items/Special/MonsterStatuette.cs @@ -203,7 +203,7 @@ namespace Server.Items Hue = 0xF4; } - public override bool HandlesOnMovement{ get{ return m_TurnedOn && IsLockedDown; } } + public override bool HandlesOnMovement => m_TurnedOn && IsLockedDown; public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -322,4 +322,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Mutation Core/PlagueBeastGland.cs b/Scripts/Items/Special/Mutation Core/PlagueBeastGland.cs index cb0dac7e6..74c891e50 100644 --- a/Scripts/Items/Special/Mutation Core/PlagueBeastGland.cs +++ b/Scripts/Items/Special/Mutation Core/PlagueBeastGland.cs @@ -5,10 +5,11 @@ namespace Server.Items { public class PlagueBeastGland : Item { + public override string DefaultName => "a healthy gland"; + [Constructible] public PlagueBeastGland() : base( 0x1CEF ) { - Name = "A Healthy Gland"; Weight = 1.0; Hue = 0x6; } diff --git a/Scripts/Items/Special/Mutation Core/PlagueBeastInnard.cs b/Scripts/Items/Special/Mutation Core/PlagueBeastInnard.cs index 3c524b7da..41d59b276 100644 --- a/Scripts/Items/Special/Mutation Core/PlagueBeastInnard.cs +++ b/Scripts/Items/Special/Mutation Core/PlagueBeastInnard.cs @@ -7,14 +7,11 @@ namespace Server.Items { public class PlagueBeastInnard : Item, IScissorable, ICarvable { - public PlagueBeastLord Owner - { - get { return RootParent as PlagueBeastLord; } - } + public PlagueBeastLord Owner => RootParent as PlagueBeastLord; + public override string DefaultName => "plague beast innards"; public PlagueBeastInnard( int itemID, int hue ) : base( itemID ) { - Name = "plague beast innards"; Hue = hue; Movable = false; Weight = 1.0; diff --git a/Scripts/Items/Special/Mutation Core/PlagueBeastMutationCore.cs b/Scripts/Items/Special/Mutation Core/PlagueBeastMutationCore.cs index c33aadc64..3a07bed88 100644 --- a/Scripts/Items/Special/Mutation Core/PlagueBeastMutationCore.cs +++ b/Scripts/Items/Special/Mutation Core/PlagueBeastMutationCore.cs @@ -16,12 +16,12 @@ namespace Server.Items set { m_Cut = value; } } + public override string DefaultName => "a plague beast mutation core"; + [Constructible] public PlagueBeastMutationCore() : base( 0x1CF0 ) { m_Cut = true; - - Name = "a plague beast mutation core"; Weight = 1.0; Hue = 0x480; } @@ -36,7 +36,7 @@ namespace Server.Items Movable = true; from.AddToBackpack( this ); - from.LocalOverheadMessage( MessageType.Regular, 0x34, 1071906 ); // * You remove the plague mutation core from the plague beast, causing it to dissolve into a pile of goo * + from.LocalOverheadMessage( MessageType.Regular, 0x34, 1071906 ); // * You remove the plague mutation core from the plague beast, causing it to dissolve into a pile of goo * if ( owner != null ) Timer.DelayCall( TimeSpan.FromSeconds( 1 ), new TimerStateCallback( KillParent ), owner ); diff --git a/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs b/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs index bc498afde..b7dd9e6e8 100644 --- a/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs +++ b/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs @@ -153,7 +153,7 @@ namespace Server.Items if ( Owner != null ) Owner.PlaySound( 0x187 ); - + AddComponent( new PlagueBeastComponent( 0x1D0D, 0x0 ), 22, 3 ); AddComponent( new PlagueBeastComponent( 0x1D12, 0x0 ), 15, 18 ); AddComponent( new PlagueBeastComponent( 0x1DA3, 0x21 ), 26, 46 ); @@ -185,8 +185,8 @@ namespace Server.Items public class PlagueBeastRockOrgan : PlagueBeastOrgan { - public override bool IsCuttable { get { return true; } } - + public override bool IsCuttable => true; + public PlagueBeastRockOrgan() : base( 0x177A, 0x60 ) { } @@ -194,7 +194,7 @@ namespace Server.Items public override void Carve( Mobile from, Item with ) { if ( IsAccessibleTo( from ) ) - with.PublicOverheadMessage( MessageType.Regular, 0x3B2, 1071896 ); // This is too crude an implement for such a procedure. + with.PublicOverheadMessage( MessageType.Regular, 0x3B2, 1071896 ); // This is too crude an implement for such a procedure. } public override bool OnLifted( Mobile from, PlagueBeastComponent c ) @@ -218,7 +218,7 @@ namespace Server.Items AddComponent( new PlagueBeastComponent( 0x1777, 0x1 ), 10, 14 ); if ( BrainHue > 0 ) - AddComponent( new PlagueBeastComponent( 0x1CF0, BrainHue, true ), 1, 24 ); // 22, 29 + AddComponent( new PlagueBeastComponent( 0x1CF0, BrainHue, true ), 1, 24 ); // 22, 29 else AddComponent( new PlagueBeastBlood(), -7, 24 ); } @@ -245,7 +245,7 @@ namespace Server.Items public class PlagueBeastRubbleOrgan : PlagueBeastOrgan { private int m_Veins; - + public PlagueBeastRubbleOrgan() : base() { m_Veins = 3; @@ -351,14 +351,14 @@ namespace Server.Items m_Veins = reader.ReadInt(); } } - + public class PlagueBeastBackupOrgan : PlagueBeastOrgan { - public override bool IsCuttable { get { return true; } } + public override bool IsCuttable => true; private Timer m_Timer; private Item m_Gland; - + public PlagueBeastBackupOrgan() : base( 0x1362, 0x6 ) { } @@ -377,7 +377,7 @@ namespace Server.Items public override void Carve( Mobile from, Item with ) { if ( IsAccessibleTo( from ) ) - with.PublicOverheadMessage( MessageType.Regular, 0x3B2, 1071896 ); // This is too crude an implement for such a procedure. + with.PublicOverheadMessage( MessageType.Regular, 0x3B2, 1071896 ); // This is too crude an implement for such a procedure. } public override bool OnLifted( Mobile from, PlagueBeastComponent c ) @@ -530,7 +530,7 @@ namespace Server.Items return true; } } - + if ( m_Brains == 4 ) FinishOpening( from ); diff --git a/Scripts/Items/Special/RewardCake.cs b/Scripts/Items/Special/RewardCake.cs index be3824efc..17a4b3279 100644 --- a/Scripts/Items/Special/RewardCake.cs +++ b/Scripts/Items/Special/RewardCake.cs @@ -21,14 +21,14 @@ namespace Server.Items { } - public override bool DisplayLootType{ get{ return false; } } + public override bool DisplayLootType => false; public override void OnDoubleClick( Mobile from ) { if (! from.InRange( this.GetWorldLocation(), 1 )) { from.LocalOverheadMessage( MessageType.Regular, 906, 1019045 ); // I can't reach that. - } + } } public override void Serialize( GenericWriter writer ) @@ -46,4 +46,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Solen Items/BallOfSummoning.cs b/Scripts/Items/Special/Solen Items/BallOfSummoning.cs index 3e7497130..637f6fe52 100644 --- a/Scripts/Items/Special/Solen Items/BallOfSummoning.cs +++ b/Scripts/Items/Special/Solen Items/BallOfSummoning.cs @@ -274,7 +274,7 @@ namespace Server.Items } - + public void SummonPet( Mobile from ) { BaseCreature pet = this.Pet; @@ -393,8 +393,8 @@ namespace Server.Items m_Ball = ball; } - public override bool ClearHandsOnCast { get { return false; } } - public override bool RevealOnCast { get { return true; } } + public override bool ClearHandsOnCast => false; + public override bool RevealOnCast => true; public override TimeSpan GetCastRecovery() { @@ -468,4 +468,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs b/Scripts/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs index e7d78ad54..952c70860 100644 --- a/Scripts/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs +++ b/Scripts/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs @@ -8,14 +8,14 @@ using Server.ContextMenus; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ public class AnkhOfSacrificeComponent : AddonComponent - { - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + { + public override bool ForceShowProperties => ObjectPropertyList.Enabled; public override int LabelNumber{ get{ return 1027772; } } // Ankh of Sacrifice public AnkhOfSacrificeComponent( int itemID ) : base( itemID ) - { + { } public AnkhOfSacrificeComponent( Serial serial ) : base( serial ) @@ -25,7 +25,7 @@ namespace Server.Items public override void GetContextMenuEntries( Mobile from, List list ) { base.GetContextMenuEntries( from, list ); - + if ( from is PlayerMobile ) list.Add( new LockKarmaEntry( (PlayerMobile)from, Addon as AnkhOfSacrificeAddon ) ); @@ -60,13 +60,13 @@ namespace Server.Items m.SendLocalizedMessage( 1060197 ); // You are not dead, and thus cannot be resurrected! } else if ( m.AnkhNextUse > DateTime.UtcNow ) - { + { TimeSpan delay = m.AnkhNextUse - DateTime.UtcNow; if ( delay.TotalMinutes > 0 ) m.SendLocalizedMessage( 1079265, Math.Round( delay.TotalMinutes ).ToString() ); // You must wait ~1_minutes~ minutes before you can use this item. else - m.SendLocalizedMessage( 1079263, Math.Round( delay.TotalSeconds ).ToString() ); // You must wait ~1_seconds~ seconds before you can use this item. + m.SendLocalizedMessage( 1079263, Math.Round( delay.TotalSeconds ).ToString() ); // You must wait ~1_seconds~ seconds before you can use this item. } else { @@ -152,17 +152,17 @@ namespace Server.Items } public class AnkhOfSacrificeAddon : BaseAddon, IRewardItem { - public override bool HandlesOnMovement{ get{ return true; } } + public override bool HandlesOnMovement => true; public override BaseAddonDeed Deed - { + { get - { + { AnkhOfSacrificeDeed deed = new AnkhOfSacrificeDeed(); deed.IsRewardItem = m_IsRewardItem; - return deed; - } + return deed; + } } private bool m_IsRewardItem; @@ -172,11 +172,11 @@ namespace Server.Items { get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } - } - + } + [Constructible] public AnkhOfSacrificeAddon( bool east ) : base() - { + { if ( east ) { AddComponent( new AnkhOfSacrificeComponent( 0x1D98 ), 0, 0, 0 ); @@ -212,35 +212,35 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - } - + } + public class AnkhOfSacrificeDeed : BaseAddonDeed, IRewardItem, IRewardOption { public override int LabelNumber{ get{ return 1080397; } } // Deed For An Ankh Of Sacrifice public override BaseAddon Addon - { + { get - { + { AnkhOfSacrificeAddon addon = new AnkhOfSacrificeAddon( m_East ); addon.IsRewardItem = m_IsRewardItem; - return addon; - } + return addon; + } } - + private bool m_East; private bool m_IsRewardItem; @@ -250,7 +250,7 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public AnkhOfSacrificeDeed() : this( false ) { @@ -267,25 +267,25 @@ namespace Server.Items public AnkhOfSacrificeDeed( Serial serial ) : base( serial ) { } - + public override void OnDoubleClick( Mobile from ) { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( IsChildOf( from.Backpack ) ) { from.CloseGump( typeof( RewardOptionGump ) ); from.SendGump( new RewardOptionGump( this ) ); } else - from.SendLocalizedMessage( 1062334 ); // This item must be in your backpack to be used. + from.SendLocalizedMessage( 1062334 ); // This item must be in your backpack to be used. } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1080457 ); // 10th Year Veteran Reward } @@ -304,7 +304,7 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } diff --git a/Scripts/Items/Special/Veteran Rewards/Banner.cs b/Scripts/Items/Special/Veteran Rewards/Banner.cs index a8b66d563..bc56e496a 100644 --- a/Scripts/Items/Special/Veteran Rewards/Banner.cs +++ b/Scripts/Items/Special/Veteran Rewards/Banner.cs @@ -7,20 +7,20 @@ using Server.Targeting; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ public class Banner : Item, IAddon, IDyable, IRewardItem { - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; public Item Deed - { + { get - { + { BannerDeed deed = new BannerDeed(); deed.IsRewardItem = m_IsRewardItem; - return deed; - } + return deed; + } } private bool m_IsRewardItem; @@ -31,15 +31,15 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + public bool FacingSouth { get{ return ( ItemID & 0x1 ) == 0; } } - + [Constructible] public Banner( int itemID ) : base( itemID ) - { + { LootType = LootType.Blessed; Movable = false; } @@ -51,17 +51,17 @@ namespace Server.Items public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( Core.ML && m_IsRewardItem ) list.Add( 1076218 ); // 2nd Year Veteran Reward } - + public override void OnDoubleClick( Mobile from ) { if ( from.InRange( Location, 2 ) ) { - BaseHouse house = BaseHouse.FindHouseAt( this ); - + BaseHouse house = BaseHouse.FindHouseAt( this ); + if ( house != null && house.IsOwner( from ) ) { from.CloseGump( typeof( RewardDemolitionGump ) ); @@ -79,19 +79,19 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + public bool Dye( Mobile from, DyeTub sender ) { if ( Deleted ) @@ -101,19 +101,19 @@ namespace Server.Items return true; } - + public bool CouldFit( IPoint3D p, Map map ) - { + { if ( map == null || !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) ) return false; - + if ( FacingSouth ) return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // north wall else return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // west wall } - } - + } + public class BannerDeed : Item, IRewardItem { public override int LabelNumber{ get{ return 1041007; } } // a banner deed @@ -128,7 +128,7 @@ namespace Server.Items } [Constructible] public BannerDeed() : base( 0x14F0 ) - { + { LootType = LootType.Blessed; Weight = 1.0; } @@ -136,20 +136,20 @@ namespace Server.Items public BannerDeed( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076218 ); // 2nd Year Veteran Reward } - + public override void OnDoubleClick( Mobile from ) - { + { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( IsChildOf( from.Backpack ) ) { BaseHouse house = BaseHouse.FindHouseAt( from ); @@ -163,7 +163,7 @@ namespace Server.Items from.SendLocalizedMessage( 502092 ); // You must be in your house to do this. } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } public override void Serialize( GenericWriter writer ) @@ -171,41 +171,41 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + private class InternalGump : Gump { public const int Start = 0x15AE; public const int End = 0x15F4; - + private BannerDeed m_Banner; - + public InternalGump( BannerDeed banner ) : base( 100, 200 ) { m_Banner = banner; - + Closable = true; Disposable = true; Dragable = true; Resizable = false; - + AddPage( 0 ); - AddBackground( 25, 0, 520, 230, 0xA28 ); + AddBackground( 25, 0, 520, 230, 0xA28 ); AddLabel( 70, 12, 0x3E3, "Choose a Banner:" ); - + int itemID = Start; for ( int i = 1; i <= 4; i++ ) @@ -223,16 +223,16 @@ namespace Server.Items if ( i < 4 ) AddButton( 475, 198, 0x8B0, 0x8B0, 0, GumpButtonType.Page, i + 1 ); - } + } } - + public override void OnResponse( NetState sender, RelayInfo info ) { if ( m_Banner == null | m_Banner.Deleted ) - return; - - Mobile m = sender.Mobile; - + return; + + Mobile m = sender.Mobile; + if ( info.ButtonID >= Start && info.ButtonID <= End ) { if ( ( info.ButtonID & 0x1 ) == 0 ) @@ -243,23 +243,23 @@ namespace Server.Items } } } - + private class InternalTarget : Target { private BannerDeed m_Banner; private int m_ItemID; - + public InternalTarget( BannerDeed banner, int itemID ) : base( -1, true, TargetFlags.None ) { m_Banner = banner; m_ItemID = itemID; } - + protected override void OnTarget( Mobile from, object targeted ) { if ( m_Banner == null || m_Banner.Deleted ) return; - + if ( m_Banner.IsChildOf( from.Backpack ) ) { BaseHouse house = BaseHouse.FindHouseAt( from ); @@ -268,22 +268,22 @@ namespace Server.Items { IPoint3D p = targeted as IPoint3D; Map map = from.Map; - + if ( p == null || map == null ) return; - + Point3D p3d = new Point3D( p ); ItemData id = TileData.ItemTable[ m_ItemID & TileData.MaxItemValue ]; - + if ( map.CanFit( p3d, id.Height ) ) { house = BaseHouse.FindHouseAt( p3d, map, id.Height ); - + if ( house != null && house.IsOwner( from ) ) { bool north = BaseAddon.IsWall( p3d.X, p3d.Y - 1, p3d.Z, map ); bool west = BaseAddon.IsWall( p3d.X - 1, p3d.Y, p3d.Z, map ); - + if ( north && west ) { from.CloseGump( typeof( FacingGump ) ); @@ -292,12 +292,12 @@ namespace Server.Items else if ( north || west ) { Banner banner = null; - + if ( north ) banner = new Banner( m_ItemID ); else if ( west ) banner = new Banner( m_ItemID + 1 ); - + house.Addons.Add( banner ); banner.IsRewardItem = m_Banner.IsRewardItem; @@ -306,42 +306,42 @@ namespace Server.Items m_Banner.Delete(); } else - from.SendLocalizedMessage( 1042039 ); // The banner must be placed next to a wall. + from.SendLocalizedMessage( 1042039 ); // The banner must be placed next to a wall. } else from.SendLocalizedMessage( 1042036 ); // That location is not in your house. } else - from.SendLocalizedMessage( 500269 ); // You cannot build that there. + from.SendLocalizedMessage( 500269 ); // You cannot build that there. } else from.SendLocalizedMessage( 502092 ); // You must be in your house to do this. } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } - + private class FacingGump : Gump { private BannerDeed m_Banner; private int m_ItemID; private Point3D m_Location; private BaseHouse m_House; - + private enum Buttons { Cancel, East, South } - + public FacingGump( BannerDeed banner, int itemID, Point3D location, BaseHouse house ) : base( 150, 50 ) { m_Banner = banner; m_ItemID = itemID; m_Location = location; m_House = house; - + Closable = true; Disposable = true; Dragable = true; @@ -357,19 +357,19 @@ namespace Server.Items AddButton( 50, 35, 0x868, 0x869, (int) Buttons.East, GumpButtonType.Reply, 0 ); AddButton( 145, 35, 0x868, 0x869, (int) Buttons.South, GumpButtonType.Reply, 0 ); } - + public override void OnResponse( NetState sender, RelayInfo info ) { if ( m_Banner == null || m_Banner.Deleted || m_House == null ) - return; - - Banner banner = null; - + return; + + Banner banner = null; + if ( info.ButtonID == (int) Buttons.East ) banner = new Banner( m_ItemID + 1 ); if ( info.ButtonID == (int) Buttons.South ) banner = new Banner( m_ItemID ); - + if ( banner != null ) { m_House.Addons.Add( banner ); diff --git a/Scripts/Items/Special/Veteran Rewards/BloodyPentagram.cs b/Scripts/Items/Special/Veteran Rewards/BloodyPentagram.cs index f9f1d2652..abfb45632 100644 --- a/Scripts/Items/Special/Veteran Rewards/BloodyPentagram.cs +++ b/Scripts/Items/Special/Veteran Rewards/BloodyPentagram.cs @@ -5,14 +5,14 @@ using Server.Network; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ public class BloodyPentagramComponent : AddonComponent { - public override bool DisplayWeight{ get{ return false; } } + public override bool DisplayWeight => false; public override int LabelNumber{ get{ return 1080279; } } // Bloody Pentagram public BloodyPentagramComponent( int itemID ) : base( itemID ) - { + { } public BloodyPentagramComponent( Serial serial ) : base( serial ) @@ -25,7 +25,7 @@ namespace Server.Items writer.WriteEncodedInt( 0 ); // version } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); @@ -37,14 +37,14 @@ namespace Server.Items public class BloodyPentagramAddon : BaseAddon, IRewardItem { public override BaseAddonDeed Deed - { + { get - { + { BloodyPentagramDeed deed = new BloodyPentagramDeed(); deed.IsRewardItem = m_IsRewardItem; - return deed; - } + return deed; + } } private bool m_IsRewardItem; @@ -55,10 +55,10 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public BloodyPentagramAddon() : base() - { + { AddComponent( new BloodyPentagramComponent( 0x1CF9 ), 0, 1, 0 ); AddComponent( new BloodyPentagramComponent( 0x1CF8 ), 0, 2, 0 ); AddComponent( new BloodyPentagramComponent( 0x1CF7 ), 0, 3, 0 ); @@ -109,35 +109,35 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - } - + } + public class BloodyPentagramDeed : BaseAddonDeed, IRewardItem { public override int LabelNumber{ get{ return 1080384; } } // Bloody Pentagram public override BaseAddon Addon - { + { get - { + { BloodyPentagramAddon addon = new BloodyPentagramAddon(); addon.IsRewardItem = m_IsRewardItem; - return addon; - } + return addon; + } } - + private bool m_IsRewardItem; [CommandProperty( AccessLevel.GameMaster )] @@ -156,19 +156,19 @@ namespace Server.Items public BloodyPentagramDeed( Serial serial ) : base( serial ) { } - + public override void OnDoubleClick( Mobile from ) { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; base.OnDoubleClick( from ); - } - + } + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076221 ); // 5th Year Veteran Reward } @@ -187,7 +187,7 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } } diff --git a/Scripts/Items/Special/Veteran Rewards/Brazier.cs b/Scripts/Items/Special/Veteran Rewards/Brazier.cs index 51770770e..4ae102ecc 100644 --- a/Scripts/Items/Special/Veteran Rewards/Brazier.cs +++ b/Scripts/Items/Special/Veteran Rewards/Brazier.cs @@ -6,10 +6,10 @@ using Server.Network; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ public class RewardBrazier : Item, IRewardItem { - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; private bool m_IsRewardItem; @@ -33,10 +33,10 @@ namespace Server.Items { 0x19AA, 0x19BB }; - + [Constructible] public RewardBrazier() : this( Utility.RandomList( m_Art ) ) - { + { } [Constructible] @@ -63,7 +63,7 @@ namespace Server.Items { if ( m_Fire == null ) m_Fire = new Item(); - + m_Fire.ItemID = 0x19AB; m_Fire.Movable = false; m_Fire.MoveToWorld( new Point3D( X, Y, Z + ItemData.Height + 2 ), Map ); @@ -102,7 +102,7 @@ namespace Server.Items public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076222 ); // 6th Year Veteran Reward } @@ -112,7 +112,7 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); writer.Write( (Item) m_Fire ); } @@ -122,12 +122,12 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); m_Fire = reader.ReadItem(); } - } - + } + public class RewardBrazierDeed : Item, IRewardItem { public override int LabelNumber{ get{ return 1080527; } } // Brazier Deed @@ -151,7 +151,7 @@ namespace Server.Items public RewardBrazierDeed( Serial serial ) : base( serial ) { } - + public override void OnDoubleClick( Mobile from ) { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) @@ -188,7 +188,7 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } diff --git a/Scripts/Items/Special/Veteran Rewards/DecorativeShield.cs b/Scripts/Items/Special/Veteran Rewards/DecorativeShield.cs index f05b4dc75..349e7b72f 100644 --- a/Scripts/Items/Special/Veteran Rewards/DecorativeShield.cs +++ b/Scripts/Items/Special/Veteran Rewards/DecorativeShield.cs @@ -7,20 +7,20 @@ using Server.Targeting; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ public class DecorativeShield : Item, IAddon, IRewardItem { - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; public Item Deed - { + { get - { + { DecorativeShieldDeed deed = new DecorativeShieldDeed(); deed.IsRewardItem = m_IsRewardItem; return deed; - } + } } private bool m_IsRewardItem; @@ -31,47 +31,47 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + public bool FacingSouth { get { if ( ItemID < 0x1582 ) return ( ItemID & 0x1 ) == 0; - - return ItemID <= 0x1585; + + return ItemID <= 0x1585; } } - + [Constructible] public DecorativeShield() : this( 0x156C ) { } - + [Constructible] public DecorativeShield( int itemID ) : base( itemID ) - { + { Movable = false; } public DecorativeShield( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( Core.ML && m_IsRewardItem ) list.Add( 1076220 ); // 4th Year Veteran Reward } - + public override void OnDoubleClick( Mobile from ) { if ( from.InRange( Location, 2 ) ) { - BaseHouse house = BaseHouse.FindHouseAt( this ); - + BaseHouse house = BaseHouse.FindHouseAt( this ); + if ( house != null && house.IsOwner( from ) ) { from.CloseGump( typeof( RewardDemolitionGump ) ); @@ -89,31 +89,31 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + public bool CouldFit( IPoint3D p, Map map ) - { + { if ( map == null || !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) ) return false; - + if ( FacingSouth ) return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // north wall else return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // west wall } - } - + } + public class DecorativeShieldDeed : Item, IRewardItem { public override int LabelNumber{ get{ return 1049771; } } // deed for a decorative shield wall hanging @@ -126,10 +126,10 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public DecorativeShieldDeed() : base( 0x14F0 ) - { + { LootType = LootType.Blessed; Weight = 1.0; } @@ -137,27 +137,27 @@ namespace Server.Items public DecorativeShieldDeed( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076220 ); // 4th Year Veteran Reward } - + public override void OnDoubleClick( Mobile from ) - { + { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( IsChildOf( from.Backpack ) ) { from.CloseGump( typeof( InternalGump ) ); from.SendGump( new InternalGump( this ) ); } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } public override void Serialize( GenericWriter writer ) @@ -165,19 +165,19 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + public static int GetWestItemID( int east ) { switch ( east ) @@ -189,29 +189,29 @@ namespace Server.Items default: return east + 1; } } - + private class InternalGump : Gump { public const int Start = 0x156C; public const int End = 0x1585; - + private DecorativeShieldDeed m_Shield; private int m_Page; - + public InternalGump( DecorativeShieldDeed shield ) : this( shield, 1 ) { } - + public InternalGump( DecorativeShieldDeed shield, int page ) : base( 150, 50 ) { m_Shield = shield; m_Page = page; - + Closable = true; Disposable = true; Dragable = true; Resizable = false; - + AddPage( 0 ); AddBackground( 25, 0, 500, 230, 0xA28 ); @@ -236,18 +236,18 @@ namespace Server.Items switch ( i ) { case 1: AddButton( 455, 198, 0x8B0, 0x8B0, 0, GumpButtonType.Page, 2 ); break; - case 2: AddButton( 70, 198, 0x8AF, 0x8AF, 0, GumpButtonType.Page, 1 ); break; + case 2: AddButton( 70, 198, 0x8AF, 0x8AF, 0, GumpButtonType.Page, 1 ); break; } - } + } } - + public override void OnResponse( NetState sender, RelayInfo info ) { if ( m_Shield == null | m_Shield.Deleted ) - return; - - Mobile m = sender.Mobile; - + return; + + Mobile m = sender.Mobile; + if ( info.ButtonID >= Start && info.ButtonID <= End ) { if ( ( info.ButtonID & 0x1 ) == 0 && info.ButtonID < 0x1582 || info.ButtonID >= 0x1582 && info.ButtonID <= 0x1585 ) @@ -258,23 +258,23 @@ namespace Server.Items } } } - + private class InternalTarget : Target { private DecorativeShieldDeed m_Shield; private int m_ItemID; - + public InternalTarget( DecorativeShieldDeed shield, int itemID ) : base( -1, true, TargetFlags.None ) { m_Shield = shield; m_ItemID = itemID; } - + protected override void OnTarget( Mobile from, object targeted ) { if ( m_Shield == null || m_Shield.Deleted ) return; - + if ( m_Shield.IsChildOf( from.Backpack ) ) { BaseHouse house = BaseHouse.FindHouseAt( from ); @@ -283,22 +283,22 @@ namespace Server.Items { IPoint3D p = targeted as IPoint3D; Map map = from.Map; - + if ( p == null || map == null ) return; - + Point3D p3d = new Point3D( p ); ItemData id = TileData.ItemTable[ m_ItemID & TileData.MaxItemValue ]; - + if ( map.CanFit( p3d, id.Height ) ) { house = BaseHouse.FindHouseAt( p3d, map, id.Height ); - + if ( house != null && house.IsOwner( from ) ) { bool north = BaseAddon.IsWall( p3d.X, p3d.Y - 1, p3d.Z, map ); bool west = BaseAddon.IsWall( p3d.X - 1, p3d.Y, p3d.Z, map ); - + if ( north && west ) { from.CloseGump( typeof( FacingGump ) ); @@ -307,12 +307,12 @@ namespace Server.Items else if ( north || west ) { DecorativeShield shield = null; - + if ( north ) shield = new DecorativeShield( m_ItemID ); else if ( west ) shield = new DecorativeShield( GetWestItemID( m_ItemID ) ); - + house.Addons.Add( shield ); shield.IsRewardItem = m_Shield.IsRewardItem; @@ -321,42 +321,42 @@ namespace Server.Items m_Shield.Delete(); } else - from.SendLocalizedMessage( 1049781 ); // This decoration must be placed next to a wall. + from.SendLocalizedMessage( 1049781 ); // This decoration must be placed next to a wall. } else from.SendLocalizedMessage( 1042036 ); // That location is not in your house. } else - from.SendLocalizedMessage( 500269 ); // You cannot build that there. + from.SendLocalizedMessage( 500269 ); // You cannot build that there. } else from.SendLocalizedMessage( 502092 ); // You must be in your house to do this. } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } - + private class FacingGump : Gump { private DecorativeShieldDeed m_Shield; private int m_ItemID; private Point3D m_Location; private BaseHouse m_House; - + private enum Buttons { Cancel, South, East } - + public FacingGump( DecorativeShieldDeed shield, int itemID, Point3D location, BaseHouse house ) : base( 150, 50 ) { m_Shield = shield; m_ItemID = itemID; m_Location = location; m_House = house; - + Closable = true; Disposable = true; Dragable = true; @@ -364,26 +364,26 @@ namespace Server.Items AddPage( 0 ); AddBackground( 0, 0, 300, 150, 0xA28 ); - + AddItem( 90, 30, GetWestItemID( itemID ) ); AddItem( 180, 30, itemID ); - AddButton( 50, 35, 0x867, 0x869, (int) Buttons.East, GumpButtonType.Reply, 0 ); + AddButton( 50, 35, 0x867, 0x869, (int) Buttons.East, GumpButtonType.Reply, 0 ); AddButton( 145, 35, 0x867, 0x869, (int) Buttons.South, GumpButtonType.Reply, 0 ); } - + public override void OnResponse( NetState sender, RelayInfo info ) { if ( m_Shield == null || m_Shield.Deleted || m_House == null ) - return; - - DecorativeShield shield = null; - + return; + + DecorativeShield shield = null; + if ( info.ButtonID == (int) Buttons.East ) shield = new DecorativeShield( GetWestItemID( m_ItemID ) ); if ( info.ButtonID == (int) Buttons.South ) shield = new DecorativeShield( m_ItemID ); - + if ( shield != null ) { m_House.Addons.Add( shield ); diff --git a/Scripts/Items/Special/Veteran Rewards/FlamingHead.cs b/Scripts/Items/Special/Veteran Rewards/FlamingHead.cs index 2699e3167..048316c34 100644 --- a/Scripts/Items/Special/Veteran Rewards/FlamingHead.cs +++ b/Scripts/Items/Special/Veteran Rewards/FlamingHead.cs @@ -7,21 +7,21 @@ using Server.Targeting; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ public class FlamingHead : StoneFaceTrapNoDamage, IAddon, IRewardItem { public override int LabelNumber{ get{ return 1041266; } } // Flaming Head - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; public Item Deed - { + { get - { + { FlamingHeadDeed deed = new FlamingHeadDeed(); deed.IsRewardItem = m_IsRewardItem; - return deed; - } + return deed; + } } private bool m_IsRewardItem; @@ -32,12 +32,12 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public FlamingHead() : this( StoneFaceTrapType.NorthWall ) { } - + [Constructible] public FlamingHead( StoneFaceTrapType type ) : base() { @@ -49,21 +49,21 @@ namespace Server.Items public FlamingHead( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( Core.ML && m_IsRewardItem ) list.Add( 1076218 ); // 2nd Year Veteran Reward } - + public override void OnDoubleClick( Mobile from ) { if ( from.InRange( Location, 2 ) ) { - BaseHouse house = BaseHouse.FindHouseAt( this ); - + BaseHouse house = BaseHouse.FindHouseAt( this ); + if ( house != null && house.IsOwner( from ) ) { from.CloseGump( typeof( RewardDemolitionGump ) ); @@ -81,21 +81,21 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + public bool CouldFit( IPoint3D p, Map map ) - { + { if ( map == null || !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) ) return false; @@ -103,13 +103,13 @@ namespace Server.Items return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ) && BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // north and west wall else if ( Type == StoneFaceTrapType.NorthWall ) return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // north wall - else if ( Type == StoneFaceTrapType.WestWall ) + else if ( Type == StoneFaceTrapType.WestWall ) return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // west wall - + return false; } - } - + } + public class FlamingHeadDeed : Item, IRewardItem { public override int LabelNumber{ get{ return 1041050; } } // a flaming head deed @@ -122,10 +122,10 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public FlamingHeadDeed() : base( 0x14F0 ) - { + { LootType = LootType.Blessed; Weight = 1.0; } @@ -133,22 +133,22 @@ namespace Server.Items public FlamingHeadDeed( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076218 ); // 2nd Year Veteran Reward } - + public override void OnDoubleClick( Mobile from ) - { + { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( IsChildOf( from.Backpack ) ) - { + { BaseHouse house = BaseHouse.FindHouseAt( from ); if ( house != null && house.IsOwner( from ) ) @@ -160,7 +160,7 @@ namespace Server.Items from.SendLocalizedMessage( 502115 ); // You must be in your house to do this. } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } public override void Serialize( GenericWriter writer ) @@ -168,50 +168,50 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + private class InternalTarget : Target { private FlamingHeadDeed m_Head; - + public InternalTarget( FlamingHeadDeed head ) : base( -1, true, TargetFlags.None ) { m_Head = head; } - + protected override void OnTarget( Mobile from, object targeted ) { if ( m_Head == null || m_Head.Deleted ) return; - + if ( m_Head.IsChildOf( from.Backpack ) ) { BaseHouse house = BaseHouse.FindHouseAt( from ); - + if ( house != null && house.IsOwner( from ) ) { IPoint3D p = targeted as IPoint3D; Map map = from.Map; - + if ( p == null || map == null ) return; - + Point3D p3d = new Point3D( p ); ItemData id = TileData.ItemTable[ 0x10F5 ]; - + house = BaseHouse.FindHouseAt( p3d, map, id.Height ); - + if ( house != null && house.IsOwner( from ) ) { if ( map.CanFit( p3d, id.Height ) ) @@ -220,37 +220,37 @@ namespace Server.Items bool west = BaseAddon.IsWall( p3d.X - 1, p3d.Y, p3d.Z, map ); FlamingHead head = null; - + if ( north && west ) head = new FlamingHead( StoneFaceTrapType.NorthWestWall ); else if ( north ) head = new FlamingHead( StoneFaceTrapType.NorthWall ); else if ( west ) head = new FlamingHead( StoneFaceTrapType.WestWall ); - + if ( north || west ) { - house.Addons.Add( head ); + house.Addons.Add( head ); head.IsRewardItem = m_Head.IsRewardItem; head.MoveToWorld( p3d, map ); m_Head.Delete(); } - else + else from.SendLocalizedMessage( 1042266 ); // The head must be placed next to a wall. } else from.SendLocalizedMessage( 1042266 ); // The head must be placed next to a wall. } else - from.SendLocalizedMessage( 1042036 ); // That location is not in your house. + from.SendLocalizedMessage( 1042036 ); // That location is not in your house. } else from.SendLocalizedMessage( 502115 ); // You must be in your house to do this. } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } } } diff --git a/Scripts/Items/Special/Veteran Rewards/HangingSkeleton.cs b/Scripts/Items/Special/Veteran Rewards/HangingSkeleton.cs index 2ecb2d8bc..a1a4d381f 100644 --- a/Scripts/Items/Special/Veteran Rewards/HangingSkeleton.cs +++ b/Scripts/Items/Special/Veteran Rewards/HangingSkeleton.cs @@ -7,20 +7,20 @@ using Server.Targeting; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ public class HangingSkeleton : Item, IAddon, IRewardItem { - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; public Item Deed - { + { get - { + { HangingSkeletonDeed deed = new HangingSkeletonDeed(); deed.IsRewardItem = m_IsRewardItem; - return deed; - } + return deed; + } } private bool m_IsRewardItem; @@ -31,24 +31,24 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + public bool FacingSouth { get - { - if ( ItemID == 0x1A03 || ItemID == 0x1A05 || ItemID == 0x1A09 || + { + if ( ItemID == 0x1A03 || ItemID == 0x1A05 || ItemID == 0x1A09 || ItemID == 0x1B1E || ItemID == 0x1B7F ) - return true; + return true; return false; } } - + [Constructible] public HangingSkeleton() : this( 0x1596 ) { } - + [Constructible] public HangingSkeleton( int itemID ) : base( itemID ) { @@ -59,21 +59,21 @@ namespace Server.Items public HangingSkeleton( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( Core.ML && m_IsRewardItem ) list.Add( 1076220 ); // 4th Year Veteran Reward } - + public override void OnDoubleClick( Mobile from ) { if ( from.InRange( Location, 3 ) ) { - BaseHouse house = BaseHouse.FindHouseAt( this ); - + BaseHouse house = BaseHouse.FindHouseAt( this ); + if ( house != null && house.IsOwner( from ) ) { from.CloseGump( typeof( RewardDemolitionGump ) ); @@ -91,31 +91,31 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + public bool CouldFit( IPoint3D p, Map map ) - { + { if ( map == null || !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) ) return false; - - if ( FacingSouth ) + + if ( FacingSouth ) return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // north wall else return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // west wall } - } - + } + public class HangingSkeletonDeed : Item, IRewardItem { public override int LabelNumber{ get{ return 1049772; } } // deed for a hanging skeleton decoration @@ -128,10 +128,10 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public HangingSkeletonDeed() : base( 0x14F0 ) - { + { LootType = LootType.Blessed; Weight = 1.0; } @@ -139,20 +139,20 @@ namespace Server.Items public HangingSkeletonDeed( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076220 ); // 4th Year Veteran Reward } - + public override void OnDoubleClick( Mobile from ) - { + { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( IsChildOf( from.Backpack ) ) { BaseHouse house = BaseHouse.FindHouseAt( from ); @@ -166,7 +166,7 @@ namespace Server.Items from.SendLocalizedMessage( 502092 ); // You must be in your house to do this. } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } public override void Serialize( GenericWriter writer ) @@ -174,42 +174,42 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + public static int GetWestItemID( int south ) { switch ( south ) { case 0x1B1E: return 0x1B1D; - case 0x1B7F: return 0x1B7C; + case 0x1B7F: return 0x1B7C; default: return south + 1; } } - + private class InternalGump : Gump - { + { private HangingSkeletonDeed m_Skeleton; - + public InternalGump( HangingSkeletonDeed skeleton ) : base( 100, 200 ) { m_Skeleton = skeleton; - + Closable = true; Disposable = true; Dragable = true; Resizable = false; - + AddPage( 0 ); AddBackground( 25, 0, 500, 230, 0xA28 ); @@ -231,15 +231,15 @@ namespace Server.Items AddItem( 370, 70, 0x1B7F ); AddButton( 390, 50, 0x845, 0x846, 0x1B7F, GumpButtonType.Reply, 0 ); } - + public override void OnResponse( NetState sender, RelayInfo info ) { if ( m_Skeleton == null | m_Skeleton.Deleted ) - return; - - Mobile m = sender.Mobile; - - if ( info.ButtonID == 0x1A03 || info.ButtonID == 0x1A05 || info.ButtonID == 0x1A09 || + return; + + Mobile m = sender.Mobile; + + if ( info.ButtonID == 0x1A03 || info.ButtonID == 0x1A05 || info.ButtonID == 0x1A09 || info.ButtonID == 0x1B1E || info.ButtonID == 0x1B7F ) { m.SendLocalizedMessage( 1049780 ); // Where would you like to place this decoration? @@ -247,23 +247,23 @@ namespace Server.Items } } } - + private class InternalTarget : Target { private HangingSkeletonDeed m_Skeleton; private int m_ItemID; - + public InternalTarget( HangingSkeletonDeed banner, int itemID ) : base( -1, true, TargetFlags.None ) { m_Skeleton = banner; m_ItemID = itemID; } - + protected override void OnTarget( Mobile from, object targeted ) { if ( m_Skeleton == null || m_Skeleton.Deleted ) return; - + if ( m_Skeleton.IsChildOf( from.Backpack ) ) { BaseHouse house = BaseHouse.FindHouseAt( from ); @@ -272,22 +272,22 @@ namespace Server.Items { IPoint3D p = targeted as IPoint3D; Map map = from.Map; - + if ( p == null || map == null ) return; - + Point3D p3d = new Point3D( p ); ItemData id = TileData.ItemTable[ m_ItemID & TileData.MaxItemValue ]; - + if ( map.CanFit( p3d, id.Height ) ) { house = BaseHouse.FindHouseAt( p3d, map, id.Height ); - + if ( house != null && house.IsOwner( from ) ) { bool north = BaseAddon.IsWall( p3d.X, p3d.Y - 1, p3d.Z, map ); bool west = BaseAddon.IsWall( p3d.X - 1, p3d.Y, p3d.Z, map ); - + if ( north && west ) { from.CloseGump( typeof( FacingGump ) ); @@ -296,12 +296,12 @@ namespace Server.Items else if ( north || west ) { HangingSkeleton banner = null; - + if ( north ) banner = new HangingSkeleton( m_ItemID ); else if ( west ) banner = new HangingSkeleton( GetWestItemID( m_ItemID ) ); - + house.Addons.Add( banner ); banner.IsRewardItem = m_Skeleton.IsRewardItem; @@ -310,42 +310,42 @@ namespace Server.Items m_Skeleton.Delete(); } else - from.SendLocalizedMessage( 1042039 ); // The banner must be placed next to a wall. + from.SendLocalizedMessage( 1042039 ); // The banner must be placed next to a wall. } else from.SendLocalizedMessage( 1042036 ); // That location is not in your house. } else - from.SendLocalizedMessage( 500269 ); // You cannot build that there. + from.SendLocalizedMessage( 500269 ); // You cannot build that there. } else from.SendLocalizedMessage( 502092 ); // You must be in your house to do this. } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } - + private class FacingGump : Gump { private HangingSkeletonDeed m_Skeleton; private int m_ItemID; private Point3D m_Location; private BaseHouse m_House; - + private enum Buttons { Cancel, South, East } - + public FacingGump( HangingSkeletonDeed banner, int itemID, Point3D location, BaseHouse house ) : base( 150, 50 ) { m_Skeleton = banner; m_ItemID = itemID; m_Location = location; m_House = house; - + Closable = true; Disposable = true; Dragable = true; @@ -361,19 +361,19 @@ namespace Server.Items AddButton( 50, 35, 0x868, 0x869, (int) Buttons.East, GumpButtonType.Reply, 0 ); AddButton( 145, 35, 0x868, 0x869, (int) Buttons.South, GumpButtonType.Reply, 0 ); } - + public override void OnResponse( NetState sender, RelayInfo info ) { if ( m_Skeleton == null || m_Skeleton.Deleted || m_House == null ) - return; - - HangingSkeleton banner = null; - + return; + + HangingSkeleton banner = null; + if ( info.ButtonID == (int) Buttons.East ) banner = new HangingSkeleton( GetWestItemID( m_ItemID ) ); if ( info.ButtonID == (int) Buttons.South ) banner = new HangingSkeleton( m_ItemID ); - + if ( banner != null ) { m_House.Addons.Add( banner ); diff --git a/Scripts/Items/Special/Veteran Rewards/StoneAnkh.cs b/Scripts/Items/Special/Veteran Rewards/StoneAnkh.cs index e7436f6db..1a7f6d77d 100644 --- a/Scripts/Items/Special/Veteran Rewards/StoneAnkh.cs +++ b/Scripts/Items/Special/Veteran Rewards/StoneAnkh.cs @@ -6,10 +6,10 @@ using Server.Network; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ public class StoneAnkhComponent : AddonComponent { - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; public StoneAnkhComponent( int itemID ) : base( itemID ) { @@ -19,11 +19,11 @@ namespace Server.Items public StoneAnkhComponent( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( Addon is StoneAnkh && ((StoneAnkh) Addon).IsRewardItem ) list.Add( 1076221 ); // 5th Year Veteran Reward } @@ -34,7 +34,7 @@ namespace Server.Items writer.WriteEncodedInt( 0 ); // version } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); @@ -46,14 +46,14 @@ namespace Server.Items public class StoneAnkh : BaseAddon, IRewardItem { public override BaseAddonDeed Deed - { + { get - { + { StoneAnkhDeed deed = new StoneAnkhDeed(); deed.IsRewardItem = m_IsRewardItem; - return deed; - } + return deed; + } } private bool m_IsRewardItem; @@ -64,15 +64,15 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public StoneAnkh() : this( true ) { } - + [Constructible] public StoneAnkh( bool east ) : base() - { + { if ( east ) { AddComponent( new StoneAnkhComponent( 0x2 ), 0, 0, 0 ); @@ -88,7 +88,7 @@ namespace Server.Items public StoneAnkh( Serial serial ) : base( serial ) { } - + public override void OnChop( Mobile from ) { from.SendLocalizedMessage( 500489 ); // You can't use an axe on that. @@ -98,7 +98,7 @@ namespace Server.Items public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( Core.ML && m_IsRewardItem ) list.Add( 1076221 ); // 5th Year Veteran Reward } @@ -107,8 +107,8 @@ namespace Server.Items { if ( from.InRange( Location, 2 ) ) { - BaseHouse house = BaseHouse.FindHouseAt( this ); - + BaseHouse house = BaseHouse.FindHouseAt( this ); + if ( house != null && house.IsOwner( from ) ) { from.CloseGump( typeof( RewardDemolitionGump ) ); @@ -126,24 +126,24 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - } - + } + public class StoneAnkhDeed : BaseAddonDeed, IRewardItem { public override int LabelNumber{ get{ return 1049773; } } // deed for a stone ankh - + private bool m_East; private bool m_IsRewardItem; @@ -155,14 +155,14 @@ namespace Server.Items } public override BaseAddon Addon - { + { get - { + { StoneAnkh addon = new StoneAnkh( m_East ); addon.IsRewardItem = m_IsRewardItem; - return addon; - } + return addon; + } } [Constructible] @@ -174,30 +174,30 @@ namespace Server.Items public StoneAnkhDeed( Serial serial ) : base( serial ) { } - + public override void OnDoubleClick( Mobile from ) { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( IsChildOf( from.Backpack ) ) { from.CloseGump( typeof( InternalGump ) ); from.SendGump( new InternalGump( this ) ); } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } - + private void SendTarget( Mobile m ) { base.OnDoubleClick( m ); } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076221 ); // 5th Year Veteran Reward } @@ -216,14 +216,14 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + private class InternalGump : Gump { private StoneAnkhDeed m_Deed; - + private enum Buttons { Cancel, @@ -233,8 +233,8 @@ namespace Server.Items public InternalGump( StoneAnkhDeed deed ) : base( 150, 50 ) { - m_Deed = deed; - + m_Deed = deed; + Closable = true; Disposable = true; Dragable = true; @@ -257,7 +257,7 @@ namespace Server.Items { if ( m_Deed == null || m_Deed.Deleted ) return; - + if ( info.ButtonID != (int) Buttons.Cancel ) { m_Deed.m_East = ( info.ButtonID == (int) Buttons.East ); diff --git a/Scripts/Items/Special/Veteran Rewards/WallBanner.cs b/Scripts/Items/Special/Veteran Rewards/WallBanner.cs index 1ffec7516..c65a454dd 100644 --- a/Scripts/Items/Special/Veteran Rewards/WallBanner.cs +++ b/Scripts/Items/Special/Veteran Rewards/WallBanner.cs @@ -7,10 +7,10 @@ using Server.Targeting; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ public class WallBannerComponent : AddonComponent, IDyable { - public override bool NeedsWall{ get{ return true; } } + public override bool NeedsWall => true; public override Point3D WallPosition{ get{ return this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); } } public bool East{ get { return ((WallBanner)Addon).East; } } @@ -29,14 +29,14 @@ namespace Server.Items writer.WriteEncodedInt( 0 ); // version } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); } - + public bool Dye( Mobile from, DyeTub sender ) { if ( Deleted ) @@ -52,14 +52,14 @@ namespace Server.Items public class WallBanner : BaseAddon, IRewardItem { public override BaseAddonDeed Deed - { + { get - { + { WallBannerDeed deed = new WallBannerDeed(); deed.IsRewardItem = m_IsRewardItem; - return deed; - } + return deed; + } } private bool m_IsRewardItem; @@ -70,7 +70,7 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + private bool m_East; [CommandProperty( AccessLevel.GameMaster )] @@ -79,7 +79,7 @@ namespace Server.Items get{ return m_East; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public WallBanner( int bannerID ) : base() { @@ -87,147 +87,147 @@ namespace Server.Items switch ( bannerID ) { - case 1: + case 1: AddComponent( new WallBannerComponent( 0x161F ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x161E ), 0, 1, 0 ); AddComponent( new WallBannerComponent( 0x161D ), 0, 2, 0 ); break; - case 2: + case 2: AddComponent( new WallBannerComponent( 0x1586 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1587 ), 1, 0, 0 ); AddComponent( new WallBannerComponent( 0x1588 ), 2, 0, 0 ); break; - case 3: + case 3: AddComponent( new WallBannerComponent( 0x1622 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1621 ), 0, 1, 0 ); AddComponent( new WallBannerComponent( 0x1620 ), 0, 2, 0 ); break; - case 4: + case 4: AddComponent( new WallBannerComponent( 0x1589 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x158A ), 1, 0, 0 ); AddComponent( new WallBannerComponent( 0x158B ), 2, 0, 0 ); break; - case 5: + case 5: AddComponent( new WallBannerComponent( 0x1625 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1624 ), 0, 1, 0 ); AddComponent( new WallBannerComponent( 0x1623 ), 0, 2, 0 ); break; - case 6: + case 6: AddComponent( new WallBannerComponent( 0x158C ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x158D ), 1, 0, 0 ); AddComponent( new WallBannerComponent( 0x158E ), 2, 0, 0 ); break; - case 7: + case 7: AddComponent( new WallBannerComponent( 0x1628 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1627 ), 0, 1, 0 ); AddComponent( new WallBannerComponent( 0x1626 ), 0, 2, 0 ); break; - case 8: + case 8: AddComponent( new WallBannerComponent( 0x1590 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1591 ), 1, 0, 0 ); AddComponent( new WallBannerComponent( 0x158F ), 2, 0, 0 ); break; - case 9: + case 9: AddComponent( new WallBannerComponent( 0x162A ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1629 ), 0, 1, 0 ); AddComponent( new WallBannerComponent( 0x1626 ), 0, 2, 0 ); break; - case 10: + case 10: AddComponent( new WallBannerComponent( 0x1592 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1593 ), 1, 0, 0 ); AddComponent( new WallBannerComponent( 0x158F ), 2, 0, 0 ); break; - case 11: + case 11: AddComponent( new WallBannerComponent( 0x162D ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x162C ), 0, 1, 0 ); AddComponent( new WallBannerComponent( 0x162B ), 0, 2, 0 ); break; - case 12: + case 12: AddComponent( new WallBannerComponent( 0x1594 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1595 ), 1, 0, 0 ); AddComponent( new WallBannerComponent( 0x1596 ), 2, 0, 0 ); break; - case 13: + case 13: AddComponent( new WallBannerComponent( 0x1632 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1631 ), 0, 1, 0 ); AddComponent( new WallBannerComponent( 0x162E ), 0, 2, 0 ); break; - case 14: + case 14: AddComponent( new WallBannerComponent( 0x1598 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x159B ), 1, 0, 0 ); AddComponent( new WallBannerComponent( 0x159C ), 2, 0, 0 ); break; - case 15: + case 15: AddComponent( new WallBannerComponent( 0x1633 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1630 ), 0, 1, 0 ); AddComponent( new WallBannerComponent( 0x162F ), 0, 2, 0 ); break; - case 16: + case 16: AddComponent( new WallBannerComponent( 0x1599 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x159A ), 1, 0, 0 ); AddComponent( new WallBannerComponent( 0x159D ), 2, 0, 0 ); break; - case 17: + case 17: AddComponent( new WallBannerComponent( 0x1610 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x160F ), 0, 1, 0 ); break; - case 18: + case 18: AddComponent( new WallBannerComponent( 0x15A0 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x15A1 ), 1, 0, 0 ); break; - case 19: + case 19: AddComponent( new WallBannerComponent( 0x1612 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1611 ), 0, 1, 0 ); break; - case 20: + case 20: AddComponent( new WallBannerComponent( 0x15A2 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x15A3 ), 1, 0, 0 ); break; - case 21: + case 21: AddComponent( new WallBannerComponent( 0x1614 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1613 ), 0, 1, 0 ); break; - case 22: + case 22: AddComponent( new WallBannerComponent( 0x15A4 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x15A5 ), 1, 0, 0 ); break; - case 23: + case 23: AddComponent( new WallBannerComponent( 0x1616 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1615 ), 0, 1, 0 ); break; - case 24: + case 24: AddComponent( new WallBannerComponent( 0x15A6 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x15A7 ), 1, 0, 0 ); break; - case 25: + case 25: AddComponent( new WallBannerComponent( 0x1618 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1617 ), 0, 1, 0 ); break; - case 26: + case 26: AddComponent( new WallBannerComponent( 0x15A8 ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x15A9 ), 1, 0, 0 ); break; - case 27: + case 27: AddComponent( new WallBannerComponent( 0x161A ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x1619 ), 0, 1, 0 ); break; - case 28: + case 28: AddComponent( new WallBannerComponent( 0x15AA ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x15AB ), 1, 0, 0 ); break; - case 29: + case 29: AddComponent( new WallBannerComponent( 0x161C ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x161B ), 0, 1, 0 ); break; - case 30: + case 30: AddComponent( new WallBannerComponent( 0x15AC ), 0, 0, 0 ); AddComponent( new WallBannerComponent( 0x15AD ), 1, 0, 0 ); break; @@ -243,22 +243,22 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_East ); writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_East = reader.ReadBool(); m_IsRewardItem = reader.ReadBool(); } - } - + } + public class WallBannerDeed : BaseAddonDeed, IRewardItem { public override int LabelNumber{ get{ return 1080549; } } // Wall Banner Deed @@ -283,43 +283,43 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public WallBannerDeed() : base() - { + { LootType = LootType.Blessed; } public WallBannerDeed( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076225 ); // 9th Year Veteran Reward } - + public override void OnDoubleClick( Mobile from ) - { + { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( IsChildOf( from.Backpack ) ) { from.CloseGump( typeof( InternalGump ) ); from.SendGump( new InternalGump( this ) ); } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } - + public void Use( Mobile m, int bannerID ) { m_BannerID = bannerID; - + base.OnDoubleClick( m ); } @@ -328,32 +328,32 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - + private class InternalGump : Gump { private WallBannerDeed m_WallBanner; - + public InternalGump( WallBannerDeed WallBanner ) : base( 150, 50 ) { m_WallBanner = WallBanner; - + Closable = true; Disposable = true; Dragable = true; Resizable = false; - + AddBackground( 25, 0, 500, 265, 0xA28 ); AddLabel( 70, 12, 0x3E3, "Choose a Wall Banner:" ); diff --git a/Scripts/Items/Talismans/BaseTalisman.cs b/Scripts/Items/Talismans/BaseTalisman.cs index be764ea3e..902307f24 100644 --- a/Scripts/Items/Talismans/BaseTalisman.cs +++ b/Scripts/Items/Talismans/BaseTalisman.cs @@ -850,7 +850,7 @@ namespace Server.Items private static Type[] m_Killers = new Type[] { - typeof( OrcBomber ), typeof( OrcBrute ), typeof( Sewerrat ), typeof( Rat ), typeof( GiantRat ), + typeof( OrcBomber ), typeof( OrcBrute ), typeof( SewerRat ), typeof( Rat ), typeof( GiantRat ), typeof( Ratman ), typeof( RatmanArcher ), typeof( GiantSpider ), typeof( FrostSpider ), typeof( GiantBlackWidow ), typeof( DreadSpider ), typeof( SilverSerpent ), typeof( DeepSeaSerpent ), typeof( GiantSerpent ), typeof( Snake ), typeof( IceSnake ), typeof( IceSerpent ), typeof( LavaSerpent ), typeof( LavaSnake ), typeof( Yamandon ), diff --git a/Scripts/Items/Talismans/TalismanSlayer.cs b/Scripts/Items/Talismans/TalismanSlayer.cs index c5379d107..f313f69cc 100644 --- a/Scripts/Items/Talismans/TalismanSlayer.cs +++ b/Scripts/Items/Talismans/TalismanSlayer.cs @@ -33,14 +33,14 @@ namespace Server.Items m_Table[ TalismanSlayerName.Vermin ] = new Type[] { typeof( RatmanMage ), typeof( RatmanMage ), typeof( RatmanArcher ), typeof( Barracoon), - typeof( Ratman ), typeof( Sewerrat ), typeof( Rat ), typeof( GiantRat ) //, typeof( Chiikkaha ) + typeof( Ratman ), typeof( SewerRat ), typeof( Rat ), typeof( GiantRat ) //, typeof( Chiikkaha ) }; m_Table[ TalismanSlayerName.Bat ] = new Type[] { typeof( Mongbat ), typeof( StrongMongbat ), typeof( VampireBat ) }; - + m_Table[ TalismanSlayerName.Mage ] = new Type[] { typeof( EvilMage ), typeof( EvilMageLord ), typeof( AncientLich ), typeof( Lich ), typeof( LichLord ), @@ -62,7 +62,7 @@ namespace Server.Items }; m_Table[ TalismanSlayerName.Ice ] = new Type[] - { + { typeof( ArcticOgreLord ), typeof( IceElemental ), typeof( SnowElemental ), typeof( FrostOoze ), typeof( IceFiend ), /*typeof( UnfrozenMummy ),*/ typeof( FrostSpider ), typeof( LadyOfTheSnow ), typeof( FrostTroll ), @@ -70,7 +70,7 @@ namespace Server.Items // TODO WinterReaper, check typeof( IceSnake ), typeof( SnowLeopard ), typeof( PolarBear ), typeof( IceSerpent ), typeof( GiantIceWorm ) }; - + m_Table[ TalismanSlayerName.Flame ] = new Type[] { typeof( FireBeetle ), typeof( HellHound ), typeof( LavaSerpent ), typeof( FireElemental ), @@ -96,7 +96,7 @@ namespace Server.Items return false; Type[] types = m_Table[ name ]; - + if ( types == null || m == null ) return false; diff --git a/Scripts/Items/Talismans/TalismanSummons.cs b/Scripts/Items/Talismans/TalismanSummons.cs index fa02f0a8d..14eb91a35 100644 --- a/Scripts/Items/Talismans/TalismanSummons.cs +++ b/Scripts/Items/Talismans/TalismanSummons.cs @@ -11,10 +11,10 @@ namespace Server.Mobiles { public class BaseTalismanSummon : BaseCreature { - public override bool Commandable{ get{ return false; } } - public override bool InitialInnocent{ get{ return true; } } - //public override bool IsInvulnerable{ get{ return true; } } // TODO: Wailing banshees are NOT invulnerable, are any of the others? - + public override bool Commandable => false; + public override bool InitialInnocent => true; + //public override bool IsInvulnerable => true; // TODO: Wailing banshees are NOT invulnerable, are any of the others? + public BaseTalismanSummon() : base( AIType.AI_Melee, FightMode.None, 10, 1, 0.2, 0.4 ) { // TODO: Stats/skills @@ -23,7 +23,7 @@ namespace Server.Mobiles public BaseTalismanSummon( Serial serial ) : base( serial ) { } - + public override void AddCustomContextEntries( Mobile from, List list ) { if ( from.Alive && ControlMaster == from ) @@ -65,10 +65,11 @@ namespace Server.Mobiles public class SummonedAntLion : BaseTalismanSummon { + public override string DefaultName => "an ant lion"; + [Constructible] public SummonedAntLion() : base() { - Name = "an ant lion"; Body = 787; BaseSoundID = 1006; } @@ -94,10 +95,11 @@ namespace Server.Mobiles public class SummonedArcticOgreLord : BaseTalismanSummon { + public override string DefaultName => "an arctic ogre lord"; + [Constructible] public SummonedArcticOgreLord() : base() { - Name = "an arctic ogre lord"; Body = 135; BaseSoundID = 427; } @@ -123,10 +125,11 @@ namespace Server.Mobiles public class SummonedBakeKitsune : BaseTalismanSummon { + public override string DefaultName => "a bake kitsune"; + [Constructible] public SummonedBakeKitsune() : base() { - Name = "a bake kitsune"; Body = 246; BaseSoundID = 0x4DD; } @@ -152,10 +155,11 @@ namespace Server.Mobiles public class SummonedBogling : BaseTalismanSummon { + public override string DefaultName => "a bogling"; + [Constructible] public SummonedBogling() : base() { - Name = "a bogling"; Body = 779; BaseSoundID = 422; } @@ -181,10 +185,11 @@ namespace Server.Mobiles public class SummonedBullFrog : BaseTalismanSummon { + public override string DefaultName => "a bull frog"; + [Constructible] public SummonedBullFrog() : base() { - Name = "a bull frog"; Body = 81; Hue = Utility.RandomList( 0x5AC, 0x5A3, 0x59A, 0x591, 0x588, 0x57F ); BaseSoundID = 0x266; @@ -211,10 +216,11 @@ namespace Server.Mobiles public class SummonedChicken : BaseTalismanSummon { + public override string DefaultName => "a chicken"; + [Constructible] public SummonedChicken() : base() { - Name = "a chicken"; Body = 0xD0; BaseSoundID = 0x6E; } @@ -240,10 +246,11 @@ namespace Server.Mobiles public class SummonedCow : BaseTalismanSummon { + public override string DefaultName => "a cow"; + [Constructible] public SummonedCow() : base() { - Name = "a cow"; Body = Utility.RandomList( 0xD8, 0xE7 ); BaseSoundID = 0x78; } @@ -268,10 +275,11 @@ namespace Server.Mobiles } public class SummonedDoppleganger : BaseTalismanSummon { + public override string DefaultName => "a doppleganger"; + [Constructible] public SummonedDoppleganger() : base() { - Name = "a doppleganger"; Body = 0x309; BaseSoundID = 0x451; } @@ -297,10 +305,11 @@ namespace Server.Mobiles public class SummonedFrostSpider : BaseTalismanSummon { + public override string DefaultName => "a frost spider"; + [Constructible] public SummonedFrostSpider() : base() { - Name = "a frost spider"; Body = 20; BaseSoundID = 0x388; } @@ -326,10 +335,11 @@ namespace Server.Mobiles public class SummonedGreatHart : BaseTalismanSummon { + public override string DefaultName => "a great hart"; + [Constructible] public SummonedGreatHart() : base() { - Name = "a great hart"; Body = 0xEA; BaseSoundID = 0x82; } @@ -355,10 +365,11 @@ namespace Server.Mobiles public class SummonedLavaSerpent : BaseTalismanSummon { + public override string DefaultName => "a lava serpent"; + [Constructible] public SummonedLavaSerpent() : base() { - Name = "a lava serpent"; Body = 90; BaseSoundID = 219; } @@ -410,7 +421,7 @@ namespace Server.Mobiles } GuardedRegion r = Region as GuardedRegion; - + if ( r != null && mob.Alive ) { foreach ( Mobile m in GetMobilesInRange( 2 ) ) @@ -428,11 +439,12 @@ namespace Server.Mobiles public class SummonedOrcBrute : BaseTalismanSummon { + public override string DefaultName => "an orc brute"; + [Constructible] public SummonedOrcBrute() : base() { Body = 189; - Name = "an orc brute"; BaseSoundID = 0x45A; } @@ -457,10 +469,11 @@ namespace Server.Mobiles public class SummonedPanther : BaseTalismanSummon { + public override string DefaultName => "a panther"; + [Constructible] public SummonedPanther() : base() { - Name = "a panther"; Body = 0xD6; Hue = 0x901; BaseSoundID = 0x462; @@ -487,10 +500,11 @@ namespace Server.Mobiles public class SummonedSheep : BaseTalismanSummon { + public override string DefaultName => "a sheep"; + [Constructible] public SummonedSheep() : base() { - Name = "a sheep"; Body = 0xCF; BaseSoundID = 0xD6; } @@ -498,7 +512,7 @@ namespace Server.Mobiles public SummonedSheep( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { @@ -517,10 +531,11 @@ namespace Server.Mobiles public class SummonedSkeletalKnight : BaseTalismanSummon { + public override string DefaultName => "a skeletal knight"; + [Constructible] public SummonedSkeletalKnight() : base() { - Name = "a skeletal knight"; Body = 147; BaseSoundID = 451; } @@ -546,10 +561,11 @@ namespace Server.Mobiles public class SummonedVorpalBunny : BaseTalismanSummon { + public override string DefaultName => "a vorpal bunny"; + [Constructible] public SummonedVorpalBunny() : base() { - Name = "a vorpal bunny"; Body = 205; Hue = 0x480; BaseSoundID = 0xC9; @@ -592,10 +608,11 @@ namespace Server.Mobiles public class SummonedWailingBanshee : BaseTalismanSummon { + public override string DefaultName => "a wailing banshee"; + [Constructible] public SummonedWailingBanshee() : base() { - Name = "a wailing banshee"; Body = 310; BaseSoundID = 0x482; } diff --git a/Scripts/Items/Traps/BaseTrap.cs b/Scripts/Items/Traps/BaseTrap.cs index 98a599d89..6f32a49c9 100644 --- a/Scripts/Items/Traps/BaseTrap.cs +++ b/Scripts/Items/Traps/BaseTrap.cs @@ -15,7 +15,7 @@ namespace Server.Items { } - public override bool HandlesOnMovement{ get{ return true; } } // Tell the core that we implement OnMovement + public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement public virtual int GetEffectHue() { @@ -82,4 +82,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Traps/FireColumnTrap.cs b/Scripts/Items/Traps/FireColumnTrap.cs index 5cb823cec..3490ba06c 100644 --- a/Scripts/Items/Traps/FireColumnTrap.cs +++ b/Scripts/Items/Traps/FireColumnTrap.cs @@ -13,7 +13,7 @@ namespace Server.Items m_WarningFlame = true; } - public override bool PassivelyTriggered{ get{ return true; } } + public override bool PassivelyTriggered => true; public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.FromSeconds( 2.0 ); } } public override int PassiveTriggerRange{ get{ return 3; } } public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 0.5 ); } } @@ -108,4 +108,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Traps/GasTrap.cs b/Scripts/Items/Traps/GasTrap.cs index 00deb44c3..c72c7b778 100644 --- a/Scripts/Items/Traps/GasTrap.cs +++ b/Scripts/Items/Traps/GasTrap.cs @@ -75,7 +75,7 @@ namespace Server.Items m_Poison = poison; } - public override bool PassivelyTriggered{ get{ return false; } } + public override bool PassivelyTriggered => false; public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } public override int PassiveTriggerRange{ get{ return 0; } } public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 0.0 ); } } @@ -122,4 +122,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Traps/GiantSpikeTrap.cs b/Scripts/Items/Traps/GiantSpikeTrap.cs index faa0d9589..0ae2b838e 100644 --- a/Scripts/Items/Traps/GiantSpikeTrap.cs +++ b/Scripts/Items/Traps/GiantSpikeTrap.cs @@ -11,7 +11,7 @@ namespace Server.Items { } - public override bool PassivelyTriggered{ get{ return true; } } + public override bool PassivelyTriggered => true; public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } public override int PassiveTriggerRange{ get{ return 3; } } public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 0.0 ); } } @@ -45,4 +45,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Traps/MushroomTrap.cs b/Scripts/Items/Traps/MushroomTrap.cs index 2f6f9edc4..7979f74af 100644 --- a/Scripts/Items/Traps/MushroomTrap.cs +++ b/Scripts/Items/Traps/MushroomTrap.cs @@ -12,7 +12,7 @@ namespace Server.Items { } - public override bool PassivelyTriggered{ get{ return true; } } + public override bool PassivelyTriggered => true; public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } public override int PassiveTriggerRange{ get{ return 2; } } public override TimeSpan ResetDelay{ get{ return TimeSpan.Zero; } } @@ -59,4 +59,4 @@ namespace Server.Items OnMushroomReset(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Traps/SawTrap.cs b/Scripts/Items/Traps/SawTrap.cs index 169f0a846..cc621499f 100644 --- a/Scripts/Items/Traps/SawTrap.cs +++ b/Scripts/Items/Traps/SawTrap.cs @@ -58,7 +58,7 @@ namespace Server.Items { } - public override bool PassivelyTriggered{ get{ return false; } } + public override bool PassivelyTriggered => false; public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } public override int PassiveTriggerRange{ get{ return 0; } } public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 0.0 ); } } @@ -94,4 +94,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Traps/SpikeTrap.cs b/Scripts/Items/Traps/SpikeTrap.cs index 6a8cfb50d..b565233c7 100644 --- a/Scripts/Items/Traps/SpikeTrap.cs +++ b/Scripts/Items/Traps/SpikeTrap.cs @@ -91,7 +91,7 @@ namespace Server.Items { } - public override bool PassivelyTriggered{ get{ return false; } } + public override bool PassivelyTriggered => false; public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } public override int PassiveTriggerRange{ get{ return 0; } } public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 6.0 ); } } @@ -147,4 +147,4 @@ namespace Server.Items Extended = false; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Traps/StoneFaceTrap.cs b/Scripts/Items/Traps/StoneFaceTrap.cs index e9a023758..9a4683729 100644 --- a/Scripts/Items/Traps/StoneFaceTrap.cs +++ b/Scripts/Items/Traps/StoneFaceTrap.cs @@ -77,7 +77,7 @@ namespace Server.Items Light = LightType.Circle225; } - public override bool PassivelyTriggered{ get{ return true; } } + public override bool PassivelyTriggered => true; public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } public override int PassiveTriggerRange{ get{ return 2; } } public override TimeSpan ResetDelay{ get{ return TimeSpan.Zero; } } @@ -160,4 +160,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel1.cs b/Scripts/Items/TreasureChests/TreasureChestLevel1.cs index f2ebc6de6..6e056beba 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel1.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel1.cs @@ -6,9 +6,9 @@ namespace Server.Items { private const int m_Level = 1; - public override bool Decays { get { return true; } } + public override bool Decays => true; - public override bool IsDecoContainer { get { return false; } } + public override bool IsDecoContainer => false; public override TimeSpan DecayTime { get { return TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); } } @@ -116,4 +116,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel2.cs b/Scripts/Items/TreasureChests/TreasureChestLevel2.cs index ba23fa8ae..776f98f0e 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel2.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel2.cs @@ -6,9 +6,9 @@ namespace Server.Items { private const int m_Level = 2; - public override bool Decays { get { return true; } } + public override bool Decays => true; - public override bool IsDecoContainer { get { return false; } } + public override bool IsDecoContainer => false; public override TimeSpan DecayTime { get { return TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); } } @@ -147,4 +147,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel3.cs b/Scripts/Items/TreasureChests/TreasureChestLevel3.cs index 94e757e94..78743467d 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel3.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel3.cs @@ -6,9 +6,9 @@ namespace Server.Items { private const int m_Level = 3; - public override bool Decays { get { return true; } } + public override bool Decays => true; - public override bool IsDecoContainer { get { return false; } } + public override bool IsDecoContainer => false; public override TimeSpan DecayTime { get { return TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); } } @@ -162,4 +162,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel4.cs b/Scripts/Items/TreasureChests/TreasureChestLevel4.cs index 39ebd7c34..0a3ffbd02 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel4.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel4.cs @@ -6,9 +6,9 @@ namespace Server.Items { private const int m_Level = 4; - public override bool Decays { get { return true; } } + public override bool Decays => true; - public override bool IsDecoContainer { get { return false; } } + public override bool IsDecoContainer => false; public override TimeSpan DecayTime { get { return TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); } } @@ -171,4 +171,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/ArmorPierce.cs b/Scripts/Items/Weapons/Abilities/ArmorPierce.cs index 66280c906..467f26596 100644 --- a/Scripts/Items/Weapons/Abilities/ArmorPierce.cs +++ b/Scripts/Items/Weapons/Abilities/ArmorPierce.cs @@ -26,7 +26,7 @@ namespace Server.Items public override int BaseMana{ get{ return 30; } } public override double DamageScalar{ get{ return 1.5; } } - public override bool RequiresSE { get { return true; } } + public override bool RequiresSE => true; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -41,4 +41,4 @@ namespace Server.Items defender.FixedParticles( 0x3728, 1, 26, 0x26D6, 0, 0, EffectLayer.Waist ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/MovingShot.cs b/Scripts/Items/Weapons/Abilities/MovingShot.cs index b64d7de6e..74d7f2843 100644 --- a/Scripts/Items/Weapons/Abilities/MovingShot.cs +++ b/Scripts/Items/Weapons/Abilities/MovingShot.cs @@ -19,7 +19,7 @@ namespace Server.Items { return ( Validate( attacker ) && CheckMana( attacker, true ) ); } - + public override void OnMiss( Mobile attacker, Mobile defender ) { //Validates in OnSwing for accuracy scalar @@ -29,7 +29,7 @@ namespace Server.Items attacker.SendLocalizedMessage( 1060089 ); // You fail to execute your special move } - public override bool ValidatesDuringHit { get { return false; } } + public override bool ValidatesDuringHit => false; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -40,4 +40,4 @@ namespace Server.Items attacker.SendLocalizedMessage( 1060216 ); // Your shot was successful } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/RidingSwipe.cs b/Scripts/Items/Weapons/Abilities/RidingSwipe.cs index 337160314..e7ceb6a4d 100644 --- a/Scripts/Items/Weapons/Abilities/RidingSwipe.cs +++ b/Scripts/Items/Weapons/Abilities/RidingSwipe.cs @@ -18,7 +18,7 @@ namespace Server.Items public override int BaseMana { get { return 30; } } - public override bool RequiresSE { get { return true; } } + public override bool RequiresSE => true; public override bool CheckSkills( Mobile from ) { @@ -53,16 +53,16 @@ namespace Server.Items if( mount != null ) //Ethy mounts don't take damage { int amount = 10 + (int)(10.0 * (attacker.Skills[SkillName.Bushido].Value - 50.0) / 70.0 + 5); - + AOS.Damage( mount, null, amount, 100, 0, 0, 0, 0 ); //The mount just takes damage, there's no flagging as if it was attacking the mount directly - + //TODO: Mount prevention until mount healed } } else { int amount = 10 + (int)(10.0 * (attacker.Skills[SkillName.Bushido].Value - 50.0) / 70.0 + 5); - + AOS.Damage( defender, attacker, amount, 100, 0, 0, 0, 0 ); if( Server.Items.ParalyzingBlow.IsImmune( defender ) ) //Does it still do damage? @@ -78,4 +78,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/AI/SpeedInfo.cs b/Scripts/Mobiles/AI/SpeedInfo.cs index 8890c1919..d40753f28 100644 --- a/Scripts/Mobiles/AI/SpeedInfo.cs +++ b/Scripts/Mobiles/AI/SpeedInfo.cs @@ -64,7 +64,7 @@ namespace Server LoadTable(); SpeedInfo sp = null; - + m_Table.TryGetValue(obj.GetType(), out sp); if ( sp == null ) @@ -104,7 +104,7 @@ namespace Server typeof( HeadlessOne ), typeof( Jwilson ), typeof( Mummy ), typeof( Ogre ), typeof( OgreLord ), typeof( PlagueBeast ), typeof( Quagmire ), typeof( Rat ), typeof( RottingCorpse ), - typeof( Sewerrat ), typeof( Skeleton ), typeof( Slime ), + typeof( SewerRat ), typeof( Skeleton ), typeof( Slime ), typeof( Zombie ), typeof( Walrus ), typeof( RestlessSoul ), typeof( CrystalElemental ), typeof( DarknightCreeper ), typeof( MoundOfMaggots ), typeof( Juggernaut ), typeof( Yamandon ), typeof( Serado ) @@ -225,4 +225,4 @@ namespace Server } ) }; } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Bears/BlackBear.cs b/Scripts/Mobiles/Animals/Bears/BlackBear.cs index 1895ff3e7..0fffef3b3 100644 --- a/Scripts/Mobiles/Animals/Bears/BlackBear.cs +++ b/Scripts/Mobiles/Animals/Bears/BlackBear.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Bear" )] public class BlackBear : BaseCreature { + public override string DefaultName => "a black bear"; + [Constructible] public BlackBear() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a black bear"; Body = 211; BaseSoundID = 0xA3; @@ -66,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Bears/BrownBear.cs b/Scripts/Mobiles/Animals/Bears/BrownBear.cs index f30f06fb8..6612a8055 100644 --- a/Scripts/Mobiles/Animals/Bears/BrownBear.cs +++ b/Scripts/Mobiles/Animals/Bears/BrownBear.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a bear corpse" )] public class BrownBear : BaseCreature { + public override string DefaultName => "a brown bear"; + [Constructible] public BrownBear() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a brown bear"; Body = 167; BaseSoundID = 0xA3; @@ -65,4 +66,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Bears/GrizzlyBear.cs b/Scripts/Mobiles/Animals/Bears/GrizzlyBear.cs index a4c7e02f6..c6f1b469a 100644 --- a/Scripts/Mobiles/Animals/Bears/GrizzlyBear.cs +++ b/Scripts/Mobiles/Animals/Bears/GrizzlyBear.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Grizzlybear" )] public class GrizzlyBear : BaseCreature { + public override string DefaultName => "a grizzly bear"; + [Constructible] public GrizzlyBear() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a grizzly bear"; Body = 212; BaseSoundID = 0xA3; @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Bears/PolarBear.cs b/Scripts/Mobiles/Animals/Bears/PolarBear.cs index f728c91fe..d90be8733 100644 --- a/Scripts/Mobiles/Animals/Bears/PolarBear.cs +++ b/Scripts/Mobiles/Animals/Bears/PolarBear.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Polarbear" )] public class PolarBear : BaseCreature { + public override string DefaultName => "a polar bear"; + [Constructible] public PolarBear() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a polar bear"; Body = 213; BaseSoundID = 0xA3; @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Birds/Chicken.cs b/Scripts/Mobiles/Animals/Birds/Chicken.cs index 15279605a..806f94a93 100644 --- a/Scripts/Mobiles/Animals/Birds/Chicken.cs +++ b/Scripts/Mobiles/Animals/Birds/Chicken.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a chicken corpse" )] public class Chicken : BaseCreature { + public override string DefaultName => "a chicken"; + [Constructible] public Chicken() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a chicken"; Body = 0xD0; BaseSoundID = 0x6E; @@ -43,7 +44,7 @@ namespace Server.Mobiles public override int Meat{ get{ return 1; } } public override MeatType MeatType{ get{ return MeatType.Bird; } } public override FoodType FavoriteFood{ get{ return FoodType.GrainsAndHay; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public override int Feathers{ get{ return 25; } } @@ -65,4 +66,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Birds/Crane.cs b/Scripts/Mobiles/Animals/Birds/Crane.cs index fab49009f..0be925d3b 100644 --- a/Scripts/Mobiles/Animals/Birds/Crane.cs +++ b/Scripts/Mobiles/Animals/Birds/Crane.cs @@ -3,13 +3,14 @@ using Server.Mobiles; namespace Server.Mobiles { - [CorpseName( "a crane corpse" )] + [CorpseName( "a bird corpse" )] public class Crane : BaseCreature { + public override string DefaultName => "a crane"; + [Constructible] public Crane() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a crane"; Body = 254; BaseSoundID = 0x4D7; @@ -83,4 +84,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Birds/Eagle.cs b/Scripts/Mobiles/Animals/Birds/Eagle.cs index 14cb629a0..95b59bd6c 100644 --- a/Scripts/Mobiles/Animals/Birds/Eagle.cs +++ b/Scripts/Mobiles/Animals/Birds/Eagle.cs @@ -4,13 +4,14 @@ using Server.Mobiles; namespace Server.Mobiles { - [CorpseName( "an eagle corpse" )] + [CorpseName( "a bird corpse" )] public class Eagle : BaseCreature { + public override string DefaultName => "an eagle"; + [Constructible] public Eagle() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "an eagle"; Body = 5; BaseSoundID = 0x2EE; @@ -49,7 +50,7 @@ namespace Server.Mobiles public override MeatType MeatType{ get{ return MeatType.Bird; } } public override int Feathers{ get{ return 36; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public Eagle(Serial serial) : base(serial) { @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Birds/Phoenix.cs b/Scripts/Mobiles/Animals/Birds/Phoenix.cs index f8367631c..1a10f33ea 100644 --- a/Scripts/Mobiles/Animals/Birds/Phoenix.cs +++ b/Scripts/Mobiles/Animals/Birds/Phoenix.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a phoenix corpse" )] public class Phoenix : BaseCreature { + public override string DefaultName => "a phoenix"; + [Constructible] public Phoenix() : base( AIType.AI_Mage, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a phoenix"; Body = 5; Hue = 0x674; BaseSoundID = 0x8F; @@ -53,7 +54,7 @@ namespace Server.Mobiles public override int Meat{ get{ return 1; } } public override MeatType MeatType{ get{ return MeatType.Bird; } } public override int Feathers{ get{ return 36; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public Phoenix( Serial serial ) : base( serial ) { @@ -71,4 +72,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Canines/DireWolf.cs b/Scripts/Mobiles/Animals/Canines/DireWolf.cs index ff6947e22..21ca0b58d 100644 --- a/Scripts/Mobiles/Animals/Canines/DireWolf.cs +++ b/Scripts/Mobiles/Animals/Canines/DireWolf.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Direwolf" )] public class DireWolf : BaseCreature { + public override string DefaultName => "a dire wolf"; + [Constructible] public DireWolf() : base( AIType.AI_Melee,FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a dire wolf"; Body = 23; BaseSoundID = 0xE5; @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Canines/GreyWolf.cs b/Scripts/Mobiles/Animals/Canines/GreyWolf.cs index fb316e75f..b0a42bc01 100644 --- a/Scripts/Mobiles/Animals/Canines/GreyWolf.cs +++ b/Scripts/Mobiles/Animals/Canines/GreyWolf.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Greywolf" )] public class GreyWolf : BaseCreature { + public override string DefaultName => "a grey wolf"; + [Constructible] public GreyWolf() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a grey wolf"; Body = Utility.RandomList( 25, 27 ); BaseSoundID = 0xE5; @@ -68,4 +69,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Canines/TimberWolf.cs b/Scripts/Mobiles/Animals/Canines/TimberWolf.cs index fae5aeb87..a29c6d0dd 100644 --- a/Scripts/Mobiles/Animals/Canines/TimberWolf.cs +++ b/Scripts/Mobiles/Animals/Canines/TimberWolf.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Timberwolf" )] public class TimberWolf : BaseCreature { + public override string DefaultName => "a timber wolf"; + [Constructible] public TimberWolf() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a timber wolf"; Body = 225; BaseSoundID = 0xE5; @@ -68,4 +69,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Canines/WhiteWolf.cs b/Scripts/Mobiles/Animals/Canines/WhiteWolf.cs index b7a8afc27..b81fdaeeb 100644 --- a/Scripts/Mobiles/Animals/Canines/WhiteWolf.cs +++ b/Scripts/Mobiles/Animals/Canines/WhiteWolf.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Whitewolf" )] public class WhiteWolf : BaseCreature { + public override string DefaultName => "a white wolf"; + [Constructible] public WhiteWolf() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a white wolf"; Body = Utility.RandomList( 34, 37 ); BaseSoundID = 0xE5; @@ -68,4 +69,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Cows/Bull.cs b/Scripts/Mobiles/Animals/Cows/Bull.cs index c98fd38ee..5ba855604 100644 --- a/Scripts/Mobiles/Animals/Cows/Bull.cs +++ b/Scripts/Mobiles/Animals/Cows/Bull.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a bull corpse" )] public class Bull : BaseCreature { + public override string DefaultName => "a bull"; + [Constructible] public Bull() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a bull"; Body = Utility.RandomList( 0xE8, 0xE9 ); BaseSoundID = 0x64; @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Cows/Cow.cs b/Scripts/Mobiles/Animals/Cows/Cow.cs index 6c3d526bb..c6a3fb75e 100644 --- a/Scripts/Mobiles/Animals/Cows/Cow.cs +++ b/Scripts/Mobiles/Animals/Cows/Cow.cs @@ -24,10 +24,11 @@ namespace Server.Mobiles set { m_Milk = value; } } + public override string DefaultName => "a cow"; + [Constructible] public Cow() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a cow"; Body = Utility.RandomList( 0xD8, 0xE7 ); BaseSoundID = 0x78; @@ -136,4 +137,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Felines/Cougar.cs b/Scripts/Mobiles/Animals/Felines/Cougar.cs index f22a8baa3..a2fe5a70c 100644 --- a/Scripts/Mobiles/Animals/Felines/Cougar.cs +++ b/Scripts/Mobiles/Animals/Felines/Cougar.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a cougar corpse" )] public class Cougar : BaseCreature { + public override string DefaultName => "a cougar"; + [Constructible] public Cougar() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a cougar"; Body = 63; BaseSoundID = 0x73; @@ -66,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Felines/HellCat.cs b/Scripts/Mobiles/Animals/Felines/HellCat.cs index 064c26391..979072b76 100644 --- a/Scripts/Mobiles/Animals/Felines/HellCat.cs +++ b/Scripts/Mobiles/Animals/Felines/HellCat.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Hellcat" )] public class HellCat : BaseCreature { + public override string DefaultName => "a hell cat"; + [Constructible] public HellCat() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a hell cat"; Body = 0xC9; Hue = Utility.RandomList( 0x647, 0x650, 0x659, 0x662, 0x66B, 0x674); BaseSoundID = 0x69; @@ -50,7 +51,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool HasBreath => true; // fire breath enabled public override int Hides{ get{ return 10; } } public override HideType HideType{ get{ return HideType.Spined; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } @@ -74,4 +75,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Felines/Panther.cs b/Scripts/Mobiles/Animals/Felines/Panther.cs index d6f559559..3b4909087 100644 --- a/Scripts/Mobiles/Animals/Felines/Panther.cs +++ b/Scripts/Mobiles/Animals/Felines/Panther.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a panther corpse" )] public class Panther : BaseCreature { + public override string DefaultName => "a panther"; + [Constructible] public Panther() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a panther"; Body = 0xD6; Hue = 0x901; BaseSoundID = 0x462; @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Felines/PredatorHellCat.cs b/Scripts/Mobiles/Animals/Felines/PredatorHellCat.cs index e32f6d108..637253a83 100644 --- a/Scripts/Mobiles/Animals/Felines/PredatorHellCat.cs +++ b/Scripts/Mobiles/Animals/Felines/PredatorHellCat.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Preditorhellcat" )] public class PredatorHellCat : BaseCreature { + public override string DefaultName => "a hell cat"; + [Constructible] public PredatorHellCat() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a hell cat"; Body = 127; BaseSoundID = 0xBA; @@ -48,7 +49,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool HasBreath => true; // fire breath enabled public override int Hides{ get{ return 10; } } public override HideType HideType{ get{ return HideType.Spined; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Felines/SnowLeopard.cs b/Scripts/Mobiles/Animals/Felines/SnowLeopard.cs index 536453339..40b6c60b9 100644 --- a/Scripts/Mobiles/Animals/Felines/SnowLeopard.cs +++ b/Scripts/Mobiles/Animals/Felines/SnowLeopard.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Snowleopard" )] public class SnowLeopard : BaseCreature { + public override string DefaultName => "a snow leopard"; + [Constructible] public SnowLeopard() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a snow leopard"; Body = Utility.RandomList( 64, 65 ); BaseSoundID = 0x73; @@ -68,4 +69,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Boar.cs b/Scripts/Mobiles/Animals/Misc/Boar.cs index 3db16fd9e..bdef8b6c8 100644 --- a/Scripts/Mobiles/Animals/Misc/Boar.cs +++ b/Scripts/Mobiles/Animals/Misc/Boar.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a pig corpse" )] public class Boar : BaseCreature { + public override string DefaultName => "a boar"; + [Constructible] public Boar() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a boar"; Body = 0x122; BaseSoundID = 0xC4; @@ -63,4 +64,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/BullFrog.cs b/Scripts/Mobiles/Animals/Misc/BullFrog.cs index 6f951d3e5..9e4007f26 100644 --- a/Scripts/Mobiles/Animals/Misc/BullFrog.cs +++ b/Scripts/Mobiles/Animals/Misc/BullFrog.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Bullfrog" )] public class BullFrog : BaseCreature { + public override string DefaultName => "a bull frog"; + [Constructible] public BullFrog() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a bull frog"; Body = 81; Hue = Utility.RandomList( 0x5AC,0x5A3,0x59A,0x591,0x588,0x57F ); BaseSoundID = 0x266; @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Dolphin.cs b/Scripts/Mobiles/Animals/Misc/Dolphin.cs index e383f6a1e..7921d8a39 100644 --- a/Scripts/Mobiles/Animals/Misc/Dolphin.cs +++ b/Scripts/Mobiles/Animals/Misc/Dolphin.cs @@ -6,11 +6,12 @@ namespace Server.Mobiles [CorpseName( "a dolphin corpse" )] public class Dolphin : BaseCreature { + public override string DefaultName => "a dolphin"; + [Constructible] public Dolphin() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a dolphin"; Body = 0x97; BaseSoundID = 0x8A; @@ -85,4 +86,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Gaman.cs b/Scripts/Mobiles/Animals/Misc/Gaman.cs index 0dc28f6e1..54ecd971e 100644 --- a/Scripts/Mobiles/Animals/Misc/Gaman.cs +++ b/Scripts/Mobiles/Animals/Misc/Gaman.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a gaman corpse" )] public class Gaman : BaseCreature { + public override string DefaultName => "a gaman"; + [Constructible] public Gaman() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a gaman"; Body = 248; SetStr( 146, 175 ); diff --git a/Scripts/Mobiles/Animals/Misc/GiantToad.cs b/Scripts/Mobiles/Animals/Misc/GiantToad.cs index d28b16cd4..68a494b19 100644 --- a/Scripts/Mobiles/Animals/Misc/GiantToad.cs +++ b/Scripts/Mobiles/Animals/Misc/GiantToad.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Gianttoad" )] public class GiantToad : BaseCreature { + public override string DefaultName => "a giant toad"; + [Constructible] public GiantToad() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a giant toad"; Body = 80; BaseSoundID = 0x26B; @@ -75,4 +76,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Goat.cs b/Scripts/Mobiles/Animals/Misc/Goat.cs index ff5f20e3b..2088d027f 100644 --- a/Scripts/Mobiles/Animals/Misc/Goat.cs +++ b/Scripts/Mobiles/Animals/Misc/Goat.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a goat corpse" )] public class Goat : BaseCreature { + public override string DefaultName => "a goat"; + [Constructible] public Goat() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a goat"; Body = 0xD1; BaseSoundID = 0x99; @@ -62,4 +63,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Gorilla.cs b/Scripts/Mobiles/Animals/Misc/Gorilla.cs index b5db130a4..75b41bf9c 100644 --- a/Scripts/Mobiles/Animals/Misc/Gorilla.cs +++ b/Scripts/Mobiles/Animals/Misc/Gorilla.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a gorilla corpse" )] public class Gorilla : BaseCreature { + public override string DefaultName => "a gorilla"; + [Constructible] public Gorilla() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a gorilla"; Body = 0x1D; BaseSoundID = 0x9E; @@ -64,4 +65,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/GreatHart.cs b/Scripts/Mobiles/Animals/Misc/GreatHart.cs index 24a1d0c6c..6441ae1f3 100644 --- a/Scripts/Mobiles/Animals/Misc/GreatHart.cs +++ b/Scripts/Mobiles/Animals/Misc/GreatHart.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Greathart" )] public class GreatHart : BaseCreature { + public override string DefaultName => "a great hart"; + [Constructible] public GreatHart() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a great hart"; Body = 0xEA; SetStr( 41, 71 ); @@ -49,20 +50,20 @@ namespace Server.Mobiles { } - public override int GetAttackSound() - { - return 0x82; - } + public override int GetAttackSound() + { + return 0x82; + } - public override int GetHurtSound() - { - return 0x83; - } + public override int GetHurtSound() + { + return 0x83; + } - public override int GetDeathSound() - { - return 0x84; - } + public override int GetDeathSound() + { + return 0x84; + } public override void Serialize(GenericWriter writer) { @@ -78,4 +79,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Hind.cs b/Scripts/Mobiles/Animals/Misc/Hind.cs index a823a8bc1..62bbeb7c1 100644 --- a/Scripts/Mobiles/Animals/Misc/Hind.cs +++ b/Scripts/Mobiles/Animals/Misc/Hind.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a deer corpse" )] public class Hind : BaseCreature { + public override string DefaultName => "a hind"; + [Constructible] public Hind() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a hind"; Body = 0xED; SetStr( 21, 51 ); @@ -48,20 +49,20 @@ namespace Server.Mobiles { } - public override int GetAttackSound() - { - return 0x82; - } + public override int GetAttackSound() + { + return 0x82; + } - public override int GetHurtSound() - { - return 0x83; - } + public override int GetHurtSound() + { + return 0x83; + } - public override int GetDeathSound() - { - return 0x84; - } + public override int GetDeathSound() + { + return 0x84; + } public override void Serialize(GenericWriter writer) { @@ -77,4 +78,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Llama.cs b/Scripts/Mobiles/Animals/Misc/Llama.cs index a304e35cc..630eec26b 100644 --- a/Scripts/Mobiles/Animals/Misc/Llama.cs +++ b/Scripts/Mobiles/Animals/Misc/Llama.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a llama corpse" )] public class Llama : BaseCreature { + public override string DefaultName => "a llama"; + [Constructible] public Llama() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a llama"; Body = 0xDC; BaseSoundID = 0x3F3; @@ -62,4 +63,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/MountainGoat.cs b/Scripts/Mobiles/Animals/Misc/MountainGoat.cs index 1cb35b257..a31a1ac10 100644 --- a/Scripts/Mobiles/Animals/Misc/MountainGoat.cs +++ b/Scripts/Mobiles/Animals/Misc/MountainGoat.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a mountain goat corpse" )] public class MountainGoat : BaseCreature { + public override string DefaultName => "a mountain goat"; + [Constructible] public MountainGoat() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a mountain goat"; Body = 88; BaseSoundID = 0x99; @@ -66,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/PackHorse.cs b/Scripts/Mobiles/Animals/Misc/PackHorse.cs index f6a036874..678739574 100644 --- a/Scripts/Mobiles/Animals/Misc/PackHorse.cs +++ b/Scripts/Mobiles/Animals/Misc/PackHorse.cs @@ -10,10 +10,11 @@ namespace Server.Mobiles [CorpseName( "a horse corpse" )] public class PackHorse : BaseCreature { + public override string DefaultName => "a pack horse"; + [Constructible] public PackHorse() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a pack horse"; Body = 291; BaseSoundID = 0xA8; @@ -219,4 +220,4 @@ namespace Server.Mobiles from.Use( item ); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/PackLlama.cs b/Scripts/Mobiles/Animals/Misc/PackLlama.cs index d43f6e857..695711c82 100644 --- a/Scripts/Mobiles/Animals/Misc/PackLlama.cs +++ b/Scripts/Mobiles/Animals/Misc/PackLlama.cs @@ -9,10 +9,11 @@ namespace Server.Mobiles [CorpseName("a llama corpse")] public class PackLlama : BaseCreature { + public override string DefaultName => "a pack llama"; + [Constructible] public PackLlama() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a pack llama"; Body = 292; BaseSoundID = 0x3F3; @@ -140,4 +141,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Pig.cs b/Scripts/Mobiles/Animals/Misc/Pig.cs index 42ccef940..22b4f20e6 100644 --- a/Scripts/Mobiles/Animals/Misc/Pig.cs +++ b/Scripts/Mobiles/Animals/Misc/Pig.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a pig corpse" )] public class Pig : BaseCreature { + public override string DefaultName => "a pig"; + [Constructible] public Pig() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a pig"; Body = 0xCB; BaseSoundID = 0xC4; @@ -61,4 +62,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Sheep.cs b/Scripts/Mobiles/Animals/Misc/Sheep.cs index cee1977db..493838a86 100644 --- a/Scripts/Mobiles/Animals/Misc/Sheep.cs +++ b/Scripts/Mobiles/Animals/Misc/Sheep.cs @@ -39,10 +39,11 @@ namespace Server.Mobiles Body = ( DateTime.UtcNow >= m_NextWoolTime ) ? 0xCF : 0xDF; } + public override string DefaultName => "a sheep"; + [Constructible] public Sheep() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a sheep"; Body = 0xCF; BaseSoundID = 0xD6; @@ -108,4 +109,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Misc/Walrus.cs b/Scripts/Mobiles/Animals/Misc/Walrus.cs index b2253c7fc..d9150605e 100644 --- a/Scripts/Mobiles/Animals/Misc/Walrus.cs +++ b/Scripts/Mobiles/Animals/Misc/Walrus.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a walrus corpse" )] public class Walrus : BaseCreature { + public override string DefaultName => "a walrus"; + [Constructible] public Walrus() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a walrus"; Body = 0xDD; BaseSoundID = 0xE0; @@ -66,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/Beetle.cs b/Scripts/Mobiles/Animals/Mounts/Beetle.cs index fa9e77f5f..acbf3c6df 100644 --- a/Scripts/Mobiles/Animals/Mounts/Beetle.cs +++ b/Scripts/Mobiles/Animals/Mounts/Beetle.cs @@ -18,8 +18,8 @@ namespace Server.Mobiles { } - public override bool SubdueBeforeTame{ get{ return true; } } // Must be beaten into submission - public override bool ReduceSpeedWithDamage{ get{ return false; } } + public override bool SubdueBeforeTame => true; // Must be beaten into submission + public override bool ReduceSpeedWithDamage => false; [Constructible] public Beetle( string name ) : base( name, 0x317, 0x3EBC, AIType.AI_Melee, FightMode.Closest, 10, 1, 0.25, 0.5 ) @@ -175,4 +175,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs index 8e69bb756..ca7e81e15 100644 --- a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs +++ b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs @@ -102,7 +102,7 @@ namespace Server.Mobiles { } - public override bool DisplayLootType { get { return false; } } + public override bool DisplayLootType => false; public virtual int FollowerSlots { get { return 1; } } @@ -367,8 +367,8 @@ namespace Server.Mobiles m_Mount = mount; } - public override bool ClearHandsOnCast { get { return false; } } - public override bool RevealOnCast { get { return false; } } + public override bool ClearHandsOnCast => false; + public override bool RevealOnCast => false; public override TimeSpan GetCastRecovery() { @@ -715,7 +715,7 @@ namespace Server.Mobiles public class RideablePolarBear : EtherealMount { - public override int LabelNumber { get { return 1076159; } } // Rideable Polar Bear + public override int LabelNumber { get { return 1076159; } } // Rideable Polar Bear public override int EtherealHue { get { return 0; } } [Constructible] diff --git a/Scripts/Mobiles/Animals/Mounts/FireSteed.cs b/Scripts/Mobiles/Animals/Mounts/FireSteed.cs index 298b587de..07a450293 100644 --- a/Scripts/Mobiles/Animals/Mounts/FireSteed.cs +++ b/Scripts/Mobiles/Animals/Mounts/FireSteed.cs @@ -52,7 +52,7 @@ namespace Server.Mobiles PackItem( new Ruby( Utility.RandomMinMax( 16, 30 ) ) ); } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + 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; } } @@ -90,4 +90,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/HellSteed.cs b/Scripts/Mobiles/Animals/Mounts/HellSteed.cs index b6fefae69..99bf6dfdc 100644 --- a/Scripts/Mobiles/Animals/Mounts/HellSteed.cs +++ b/Scripts/Mobiles/Animals/Mounts/HellSteed.cs @@ -6,11 +6,11 @@ namespace Server.Mobiles [CorpseName( "a hellsteed corpse" )] public class HellSteed : BaseMount { - public override bool HasBreath { get { return true; } } + public override bool HasBreath => true; public override int BreathChaosDamage { get { return 100; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; - [Constructible] + [Constructible] public HellSteed() : this( "a hellsteed" ) { } @@ -64,4 +64,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/Hiryu.cs b/Scripts/Mobiles/Animals/Mounts/Hiryu.cs index c095b016e..35aa8356c 100644 --- a/Scripts/Mobiles/Animals/Mounts/Hiryu.cs +++ b/Scripts/Mobiles/Animals/Mounts/Hiryu.cs @@ -10,12 +10,9 @@ namespace Server.Mobiles { public override double WeaponAbilityChance { get { return 0.07; } } /* 1 in 15 chance of using per landed hit */ - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.Dismount; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; - public override bool StatLossAfterTame { get { return true; } } + public override bool StatLossAfterTame => true; private static int GetHue() { @@ -23,23 +20,23 @@ namespace Server.Mobiles /* 1000 1075 No Hue Color 93.02% 0x0 - * + * 10 1075 Ice Green 0.93% 0x847F 10 1075 Light Blue 0.93% 0x848D 10 1075 Strong Cyan 0.93% 0x8495 10 1075 Agapite 0.93% 0x8899 10 1075 Gold 0.93% 0x8032 - * + * 8 1075 Blue and Yellow 0.74% 0x8487 - * + * 5 1075 Ice Blue 0.47% 0x8482 - * + * 3 1075 Cyan 0.28% 0x8123 3 1075 Light Green 0.28% 0x8295 - * + * 2 1075 Strong Yellow 0.19% 0x8037 2 1075 Green 0.19% 0x8030 //this one is an approximation - * + * 1 1075 Strong Purple 0.09% 0x8490 1 1075 Strong Green 0.09% 0x855C * */ @@ -70,7 +67,7 @@ namespace Server.Mobiles return 0x848D; else if( rand <= 74 ) return 0x847F; - + return 0; } @@ -153,7 +150,7 @@ namespace Server.Mobiles public override int Meat { get { return 16; } } public override int Hides { get { return 60; } } public override FoodType FavoriteFood { get { return FoodType.Meat; } } - public override bool CanAngerOnTame { get { return true; } } + public override bool CanAngerOnTame => true; public override void OnGaveMeleeAttack( Mobile defender ) { diff --git a/Scripts/Mobiles/Animals/Mounts/Kirin.cs b/Scripts/Mobiles/Animals/Mounts/Kirin.cs index 7da247199..b59ea99c5 100644 --- a/Scripts/Mobiles/Animals/Mounts/Kirin.cs +++ b/Scripts/Mobiles/Animals/Mounts/Kirin.cs @@ -8,10 +8,10 @@ namespace Server.Mobiles [CorpseName( "a ki-rin corpse" )] public class Kirin : BaseMount { - public override bool AllowFemaleRider{ get{ return false; } } - public override bool AllowFemaleTamer{ get{ return false; } } + public override bool AllowFemaleRider => false; + public override bool AllowFemaleTamer => false; - public override bool InitialInnocent{ get{ return true; } } + public override bool InitialInnocent => true; public override TimeSpan MountAbilityDelay { get { return TimeSpan.FromHours( 1.0 ); } } @@ -130,4 +130,4 @@ namespace Server.Mobiles AI = AIType.AI_Mage; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs b/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs index 5b6c07c4e..2d5648a85 100644 --- a/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs +++ b/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs @@ -10,12 +10,9 @@ namespace Server.Mobiles { public override double WeaponAbilityChance { get { return 0.07; } } /* 1 in 15 chance of using; 1 in 5 chance of success */ - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.Dismount; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; - public override bool StatLossAfterTame { get { return true; } } + public override bool StatLossAfterTame => true; private static int GetHue() { @@ -153,7 +150,7 @@ namespace Server.Mobiles public override int Meat { get { return 16; } } public override int Hides { get { return 60; } } public override FoodType FavoriteFood { get { return FoodType.Meat; } } - public override bool CanAngerOnTame { get { return true; } } + public override bool CanAngerOnTame => true; public override void OnGaveMeleeAttack( Mobile defender ) { diff --git a/Scripts/Mobiles/Animals/Mounts/Nightmare.cs b/Scripts/Mobiles/Animals/Mounts/Nightmare.cs index 63deb2394..ce994180d 100644 --- a/Scripts/Mobiles/Animals/Mounts/Nightmare.cs +++ b/Scripts/Mobiles/Animals/Mounts/Nightmare.cs @@ -92,12 +92,12 @@ namespace Server.Mobiles return base.GetAngerSound(); } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + 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 bool CanAngerOnTame { get { return true; } } + public override bool CanAngerOnTame => true; public Nightmare( Serial serial ) : base( serial ) { @@ -122,4 +122,4 @@ namespace Server.Mobiles BaseSoundID = 0x16A; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs b/Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs index bd3eb6ca6..53c6583e9 100644 --- a/Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs +++ b/Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs @@ -54,7 +54,7 @@ namespace Server.Mobiles return 1.0; } - public override bool AutoDispel{ get{ return !Controlled; } } + public override bool AutoDispel => !Controlled; public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } public ScaledSwampDragon( Serial serial ) : base( serial ) @@ -75,4 +75,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/SkeletalMount.cs b/Scripts/Mobiles/Animals/Mounts/SkeletalMount.cs index cb7eb6fea..00dbb5cf8 100644 --- a/Scripts/Mobiles/Animals/Mounts/SkeletalMount.cs +++ b/Scripts/Mobiles/Animals/Mounts/SkeletalMount.cs @@ -6,8 +6,10 @@ namespace Server.Mobiles [CorpseName( "an undead horse corpse" )] public class SkeletalMount : BaseMount { - [Constructible] - public SkeletalMount() : this( "a skeletal steed" ) + public override string DefaultName => "a skeletal steed"; + + [Constructible] + public SkeletalMount() : this( null ) { } @@ -38,8 +40,8 @@ namespace Server.Mobiles Karma = 0; } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override bool BleedImmune{ get{ return true; } } + public override Poison PoisonImmune => Poison.Lethal; + public override bool BleedImmune => true; public SkeletalMount( Serial serial ) : base( serial ) { @@ -62,7 +64,6 @@ namespace Server.Mobiles { case 0: { - Name = "a skeletal steed"; Tamable = false; MinTameSkill = 0.0; ControlSlots = 0; @@ -71,4 +72,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/SwampDragon.cs b/Scripts/Mobiles/Animals/Mounts/SwampDragon.cs index 3b641c02a..3381107ab 100644 --- a/Scripts/Mobiles/Animals/Mounts/SwampDragon.cs +++ b/Scripts/Mobiles/Animals/Mounts/SwampDragon.cs @@ -152,14 +152,14 @@ namespace Server.Mobiles return 1.0; } - public override bool ReacquireOnMovement{ get{ return true; } } - public override bool AutoDispel{ get{ return !Controlled; } } + 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 bool CanAngerOnTame { get { return true; } } + public override bool CanAngerOnTame => true; public SwampDragon( Serial serial ) : base( serial ) { @@ -212,4 +212,4 @@ namespace Server.Mobiles BaseSoundID = 0x16A; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/Unicorn.cs b/Scripts/Mobiles/Animals/Mounts/Unicorn.cs index 05d033ddc..f85a25065 100644 --- a/Scripts/Mobiles/Animals/Mounts/Unicorn.cs +++ b/Scripts/Mobiles/Animals/Mounts/Unicorn.cs @@ -8,10 +8,10 @@ namespace Server.Mobiles [CorpseName( "a unicorn corpse" )] public class Unicorn : BaseMount { - public override bool AllowMaleRider{ get{ return false; } } - public override bool AllowMaleTamer{ get{ return false; } } + public override bool AllowMaleRider => false; + public override bool AllowMaleTamer => false; - public override bool InitialInnocent{ get{ return true; } } + public override bool InitialInnocent => true; public override TimeSpan MountAbilityDelay { get { return TimeSpan.FromHours( 1.0 ); } } @@ -114,7 +114,7 @@ namespace Server.Mobiles get{ return OppositionGroup.FeyAndUndead; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + 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; } } @@ -138,4 +138,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/Alligator.cs b/Scripts/Mobiles/Animals/Reptiles/Alligator.cs index 9fd4a0d8b..93ba24424 100644 --- a/Scripts/Mobiles/Animals/Reptiles/Alligator.cs +++ b/Scripts/Mobiles/Animals/Reptiles/Alligator.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "an alligator corpse" )] public class Alligator : BaseCreature { + public override string DefaultName => "an alligator"; + [Constructible] public Alligator() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an alligator"; Body = 0xCA; BaseSoundID = 660; @@ -69,4 +70,4 @@ namespace Server.Mobiles BaseSoundID = 660; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/GiantSerpent.cs b/Scripts/Mobiles/Animals/Reptiles/GiantSerpent.cs index 7829389fb..cdbef67f7 100644 --- a/Scripts/Mobiles/Animals/Reptiles/GiantSerpent.cs +++ b/Scripts/Mobiles/Animals/Reptiles/GiantSerpent.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Serpant" )] public class GiantSerpent : BaseCreature { + public override string DefaultName => "a giant snake"; + [Constructible] public GiantSerpent() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a giant serpent"; Body = 0x15; Hue = Utility.RandomSnakeHue(); BaseSoundID = 219; @@ -53,10 +54,10 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override Poison PoisonImmune{ get{ return Poison.Greater; } } - public override Poison HitPoison{ get{ return (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); } } + public override Poison PoisonImmune => Poison.Greater; + public override Poison HitPoison => (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); - public override bool DeathAdderCharmable{ get{ return true; } } + public override bool DeathAdderCharmable => true; public override int Meat{ get{ return 4; } } public override int Hides{ get{ return 15; } } @@ -83,4 +84,4 @@ namespace Server.Mobiles BaseSoundID = 219; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/IceSerpent.cs b/Scripts/Mobiles/Animals/Reptiles/IceSerpent.cs index 6fe7893f0..1f9a3a3e8 100644 --- a/Scripts/Mobiles/Animals/Reptiles/IceSerpent.cs +++ b/Scripts/Mobiles/Animals/Reptiles/IceSerpent.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Iceserpant" )] public class IceSerpent : BaseCreature { + public override string DefaultName => "a giant ice serpent"; + [Constructible] public IceSerpent() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a giant ice serpent"; Body = 89; BaseSoundID = 219; @@ -43,7 +44,7 @@ namespace Server.Mobiles VirtualArmor = 32; PackItem( Loot.RandomArmorOrShieldOrWeapon() ); - + switch ( Utility.Random( 10 )) { case 0: PackItem( new LeftArm() ); break; @@ -67,7 +68,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool DeathAdderCharmable{ get{ return true; } } + public override bool DeathAdderCharmable => true; public override int Meat{ get{ return 4; } } public override int Hides{ get{ return 15; } } @@ -94,4 +95,4 @@ namespace Server.Mobiles BaseSoundID = 219; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/IceSnake.cs b/Scripts/Mobiles/Animals/Reptiles/IceSnake.cs index eccc3f104..1de5fac7f 100644 --- a/Scripts/Mobiles/Animals/Reptiles/IceSnake.cs +++ b/Scripts/Mobiles/Animals/Reptiles/IceSnake.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Icesnake" )] public class IceSnake : BaseCreature { + public override string DefaultName => "an ice snake"; + [Constructible] public IceSnake() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an ice snake"; Body = 52; Hue = 0x480; BaseSoundID = 0xDB; @@ -47,7 +48,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool DeathAdderCharmable{ get{ return true; } } + public override bool DeathAdderCharmable => true; public override int Meat{ get{ return 1; } } @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/LavaLizard.cs b/Scripts/Mobiles/Animals/Reptiles/LavaLizard.cs index 3e5754d15..95c8ae43f 100644 --- a/Scripts/Mobiles/Animals/Reptiles/LavaLizard.cs +++ b/Scripts/Mobiles/Animals/Reptiles/LavaLizard.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Lavalizard" )] public class LavaLizard : BaseCreature { + public override string DefaultName => "a lava lizard"; + [Constructible] public LavaLizard() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a lava lizard"; Body = 0xCE; Hue = Utility.RandomList( 0x647, 0x650, 0x659, 0x662, 0x66B, 0x674 ); BaseSoundID = 0x5A; @@ -53,7 +54,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool HasBreath => true; // fire breath enabled public override int Hides{ get{ return 12; } } public override HideType HideType{ get{ return HideType.Spined; } } @@ -75,4 +76,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/LavaSerpent.cs b/Scripts/Mobiles/Animals/Reptiles/LavaSerpent.cs index a47afc33c..376729f7f 100644 --- a/Scripts/Mobiles/Animals/Reptiles/LavaSerpent.cs +++ b/Scripts/Mobiles/Animals/Reptiles/LavaSerpent.cs @@ -9,10 +9,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Lavaserpant" )] public class LavaSerpent : BaseCreature { + public override string DefaultName => "a lava serpent"; + [Constructible] public LavaSerpent() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a lava serpent"; Body = 90; BaseSoundID = 219; @@ -52,9 +53,9 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override bool DeathAdderCharmable{ get{ return true; } } + public override bool DeathAdderCharmable => true; - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool HasBreath => true; // fire breath enabled public override int Meat{ get{ return 4; } } public override int Hides{ get{ return 15; } } public override HideType HideType{ get{ return HideType.Spined; } } @@ -80,4 +81,4 @@ namespace Server.Mobiles BaseSoundID = 219; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/LavaSnake.cs b/Scripts/Mobiles/Animals/Reptiles/LavaSnake.cs index 4b0dd7e3f..cbee64e07 100644 --- a/Scripts/Mobiles/Animals/Reptiles/LavaSnake.cs +++ b/Scripts/Mobiles/Animals/Reptiles/LavaSnake.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Lavasnake" )] public class LavaSnake : BaseCreature { + public override string DefaultName => "a lava snake"; + [Constructible] public LavaSnake() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a lava snake"; Body = 52; Hue = Utility.RandomList( 0x647, 0x650, 0x659, 0x662, 0x66B, 0x674 ); BaseSoundID = 0xDB; @@ -49,9 +50,9 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override bool DeathAdderCharmable{ get{ return true; } } + public override bool DeathAdderCharmable => true; - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool HasBreath => true; // fire breath enabled public override int Meat{ get{ return 1; } } public LavaSnake(Serial serial) : base(serial) @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/SilverSerpent.cs b/Scripts/Mobiles/Animals/Reptiles/SilverSerpent.cs index f687c5117..4f3511e7c 100644 --- a/Scripts/Mobiles/Animals/Reptiles/SilverSerpent.cs +++ b/Scripts/Mobiles/Animals/Reptiles/SilverSerpent.cs @@ -11,11 +11,12 @@ namespace Server.Mobiles public override Faction FactionAllegiance { get { return TrueBritannians.Instance; } } public override Ethics.Ethic EthicAllegiance { get { return Ethics.Ethic.Hero; } } + public override string DefaultName => "a silver serpent"; + [Constructible] public SilverSerpent() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Body = 92; - Name = "a silver serpent"; BaseSoundID = 219; SetStr( 161, 360 ); @@ -52,11 +53,11 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool DeathAdderCharmable{ get{ return true; } } + public override bool DeathAdderCharmable => true; public override int Meat{ get{ return 1; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override Poison HitPoison{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; + public override Poison HitPoison => Poison.Lethal; public SilverSerpent(Serial serial) : base(serial) { @@ -79,4 +80,4 @@ namespace Server.Mobiles BaseSoundID = 219; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/Snake.cs b/Scripts/Mobiles/Animals/Reptiles/Snake.cs index 5324fb8eb..3021bda47 100644 --- a/Scripts/Mobiles/Animals/Reptiles/Snake.cs +++ b/Scripts/Mobiles/Animals/Reptiles/Snake.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a snake corpse" )] public class Snake : BaseCreature { + public override string DefaultName => "a snake"; + [Constructible] public Snake() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a snake"; Body = 52; Hue = Utility.RandomSnakeHue(); BaseSoundID = 0xDB; @@ -43,10 +44,10 @@ namespace Server.Mobiles MinTameSkill = 59.1; } - public override Poison PoisonImmune{ get{ return Poison.Lesser; } } - public override Poison HitPoison{ get{ return Poison.Lesser; } } + public override Poison PoisonImmune => Poison.Lesser; + public override Poison HitPoison => Poison.Lesser; - public override bool DeathAdderCharmable{ get{ return true; } } + public override bool DeathAdderCharmable => true; public override int Meat{ get{ return 1; } } public override FoodType FavoriteFood{ get{ return FoodType.Eggs; } } @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Rodents/GiantRat.cs b/Scripts/Mobiles/Animals/Rodents/GiantRat.cs index 69703dbf6..d82d5bb6f 100644 --- a/Scripts/Mobiles/Animals/Rodents/GiantRat.cs +++ b/Scripts/Mobiles/Animals/Rodents/GiantRat.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Giantrat" )] public class GiantRat : BaseCreature { + public override string DefaultName => "a giant rat"; + [Constructible] public GiantRat() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a giant rat"; Body = 0xD7; BaseSoundID = 0x188; @@ -70,4 +71,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Rodents/JackRabbit.cs b/Scripts/Mobiles/Animals/Rodents/JackRabbit.cs index 935736de7..3e36dea3f 100644 --- a/Scripts/Mobiles/Animals/Rodents/JackRabbit.cs +++ b/Scripts/Mobiles/Animals/Rodents/JackRabbit.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Jackrabbit" )] public class JackRabbit : BaseCreature { + public override string DefaultName => "a jack rabbit"; + [Constructible] public JackRabbit() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a jack rabbit"; Body = 0xCD; Hue = 0x1BB; @@ -49,20 +50,20 @@ namespace Server.Mobiles { } - public override int GetAttackSound() - { - return 0xC9; - } + public override int GetAttackSound() + { + return 0xC9; + } - public override int GetHurtSound() - { - return 0xCA; - } + public override int GetHurtSound() + { + return 0xCA; + } - public override int GetDeathSound() - { - return 0xCB; - } + public override int GetDeathSound() + { + return 0xCB; + } public override void Serialize(GenericWriter writer) { @@ -78,4 +79,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Rodents/Rabbit.cs b/Scripts/Mobiles/Animals/Rodents/Rabbit.cs index f36aa1bfc..ab00d875f 100644 --- a/Scripts/Mobiles/Animals/Rodents/Rabbit.cs +++ b/Scripts/Mobiles/Animals/Rodents/Rabbit.cs @@ -6,13 +6,14 @@ namespace Server.Mobiles [CorpseName( "a hare corpse" )] public class Rabbit : BaseCreature { + public override string DefaultName => "a rabbit"; + [Constructible] public Rabbit() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a rabbit"; Body = 205; - if ( 0.5 >= Utility.RandomDouble() ) + if ( Utility.RandomBool() ) Hue = Utility.RandomAnimalHue(); SetStr( 6, 10 ); @@ -50,20 +51,20 @@ namespace Server.Mobiles { } - public override int GetAttackSound() - { - return 0xC9; - } + public override int GetAttackSound() + { + return 0xC9; + } - public override int GetHurtSound() - { - return 0xCA; - } + public override int GetHurtSound() + { + return 0xCA; + } - public override int GetDeathSound() - { - return 0xCB; - } + public override int GetDeathSound() + { + return 0xCB; + } public override void Serialize(GenericWriter writer) { @@ -79,4 +80,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Rodents/SewerRat.cs b/Scripts/Mobiles/Animals/Rodents/SewerRat.cs index 64f6062ef..9b71e864b 100644 --- a/Scripts/Mobiles/Animals/Rodents/SewerRat.cs +++ b/Scripts/Mobiles/Animals/Rodents/SewerRat.cs @@ -3,13 +3,15 @@ using Server.Mobiles; namespace Server.Mobiles { - [CorpseName( "a sewer rat corpse" )] - public class Sewerrat : BaseCreature + [CorpseName( "a rat corpse" )] + [TypeAlias("Server.Mobiles.Sewerrat")] + public class SewerRat : BaseCreature { + public override string DefaultName => "a sewer rat"; + [Constructible] - public Sewerrat() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) + public SewerRat() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a sewer rat"; Body = 238; BaseSoundID = 0xCC; @@ -47,10 +49,10 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Eggs | FoodType.FruitsAndVegies; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Eggs | FoodType.FruitsAndVegies; - public Sewerrat(Serial serial) : base(serial) + public SewerRat(Serial serial) : base(serial) { } @@ -68,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Slimes/Jwilson.cs b/Scripts/Mobiles/Animals/Slimes/Jwilson.cs index be58fbe8b..0c80ff7b5 100644 --- a/Scripts/Mobiles/Animals/Slimes/Jwilson.cs +++ b/Scripts/Mobiles/Animals/Slimes/Jwilson.cs @@ -6,12 +6,13 @@ namespace Server.Mobiles [CorpseName( "a jwilson corpse" )] public class Jwilson : BaseCreature { + public override string DefaultName => "a jwilson"; + [Constructible] public Jwilson() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Hue = Utility.RandomList(0x89C,0x8A2,0x8A8,0x8AE); this.Body = 0x33; - this.Name = ("a jwilson"); this.VirtualArmor = 8; this.InitStats(Utility.Random(22,13),Utility.Random(16,6),Utility.Random(16,5)); @@ -29,30 +30,30 @@ namespace Server.Mobiles { } - public override int GetAngerSound() - { - return 0x1C8; - } + public override int GetAngerSound() + { + return 0x1C8; + } - public override int GetIdleSound() - { - return 0x1C9; - } + public override int GetIdleSound() + { + return 0x1C9; + } - public override int GetAttackSound() - { - return 0x1CA; - } + public override int GetAttackSound() + { + return 0x1CA; + } - public override int GetHurtSound() - { - return 0x1CB; - } + public override int GetHurtSound() + { + return 0x1CB; + } - public override int GetDeathSound() - { - return 0x1CC; - } + public override int GetDeathSound() + { + return 0x1CC; + } public override void Serialize(GenericWriter writer) { diff --git a/Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs b/Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs index 69b3617d8..f20a9cdc6 100644 --- a/Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs +++ b/Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs @@ -6,11 +6,12 @@ namespace Server.Mobiles [CorpseName("a parrot corpse")] public class Parrot : BaseCreature { + public override string DefaultName => "a parrot"; + [Constructible] public Parrot() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { this.Body = 831; - this.Name = ("a parrot"); this.VirtualArmor = Utility.Random(0,6); this.InitStats((10),Utility.Random(25,16),(10)); @@ -31,30 +32,30 @@ namespace Server.Mobiles { } - public override int GetAngerSound() - { - return 0x1B; - } + public override int GetAngerSound() + { + return 0x1B; + } - public override int GetIdleSound() - { - return 0x1C; - } + public override int GetIdleSound() + { + return 0x1C; + } - public override int GetAttackSound() - { - return 0x1D; - } + public override int GetAttackSound() + { + return 0x1D; + } - public override int GetHurtSound() - { - return 0x1E; - } + public override int GetHurtSound() + { + return 0x1E; + } - public override int GetDeathSound() - { - return 0x1F; - } + public override int GetDeathSound() + { + return 0x1F; + } public override void Serialize(GenericWriter writer) { @@ -70,4 +71,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Town Critters/Bird.cs b/Scripts/Mobiles/Animals/Town Critters/Bird.cs index a08e16303..8700f4daa 100644 --- a/Scripts/Mobiles/Animals/Town Critters/Bird.cs +++ b/Scripts/Mobiles/Animals/Town Critters/Bird.cs @@ -76,17 +76,18 @@ namespace Server.Mobiles if ( Hue == 0 ) Hue = Utility.RandomBirdHue(); - } + } } [CorpseName( "a bird corpse" )] public class TropicalBird : BaseCreature { + public override string DefaultName => "a tropical bird"; + [Constructible] public TropicalBird() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { Hue = Utility.RandomBirdHue(); - Name = "a tropical bird"; Body = 6; BaseSoundID = 0xBF; @@ -134,6 +135,6 @@ namespace Server.Mobiles base.Deserialize( reader ); int version = reader.ReadInt(); - } + } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Town Critters/Cat.cs b/Scripts/Mobiles/Animals/Town Critters/Cat.cs index 75b4ad0a9..9e521e24d 100644 --- a/Scripts/Mobiles/Animals/Town Critters/Cat.cs +++ b/Scripts/Mobiles/Animals/Town Critters/Cat.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Housecat" )] public class Cat : BaseCreature { + public override string DefaultName => "a cat"; + [Constructible] public Cat() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a cat"; Body = 0xC9; Hue = Utility.RandomAnimalHue(); BaseSoundID = 0x69; @@ -64,4 +65,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Town Critters/Dog.cs b/Scripts/Mobiles/Animals/Town Critters/Dog.cs index 251c2b8cd..979129c9e 100644 --- a/Scripts/Mobiles/Animals/Town Critters/Dog.cs +++ b/Scripts/Mobiles/Animals/Town Critters/Dog.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a dog corpse" )] public class Dog : BaseCreature { + public override string DefaultName => "a dog"; + [Constructible] public Dog() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a dog"; Body = 0xD9; Hue = Utility.RandomAnimalHue(); BaseSoundID = 0x85; @@ -63,4 +64,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Town Critters/Rat.cs b/Scripts/Mobiles/Animals/Town Critters/Rat.cs index b1e235e16..62ab81109 100644 --- a/Scripts/Mobiles/Animals/Town Critters/Rat.cs +++ b/Scripts/Mobiles/Animals/Town Critters/Rat.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a rat corpse" )] public class Rat : BaseCreature { + public override string DefaultName => "a rat"; + [Constructible] public Rat() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a rat"; Body = 238; BaseSoundID = 0xCC; @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/BaseCreature.cs b/Scripts/Mobiles/BaseCreature.cs index 656927134..a0ae78d3b 100644 --- a/Scripts/Mobiles/BaseCreature.cs +++ b/Scripts/Mobiles/BaseCreature.cs @@ -179,25 +179,25 @@ namespace Server.Mobiles private Mobile m_FocusMob; // Use focus mob instead of combatant, maybe we don't whan to fight private FightMode m_FightMode; // The style the mob uses - private int m_iRangePerception; // The view area - private int m_iRangeFight; // The fight distance + private int m_RangePerception; // The view area + private int m_RangeFight; // The fight distance - private bool m_bDebugAI; // Show debug AI messages + private bool m_DebugAI; // Show debug AI messages - private int m_iTeam; // Monster Team + private int m_Team; // Monster Team - private double m_dActiveSpeed; // Timer speed when active - private double m_dPassiveSpeed; // Timer speed when not active - private double m_dCurrentSpeed; // The current speed, lets say it could be changed by something; + private double m_ActiveSpeed; // Timer speed when active + private double m_PassiveSpeed; // Timer speed when not active + private double m_CurrentSpeed; // The current speed, lets say it could be changed by something; - private Point3D m_pHome; // The home position of the creature, used by some AI + private Point3D m_Home; // The home position of the creature, used by some AI private Map m_HomeMap; // Used by grim reaper and guards that follow across maps! - private int m_iRangeHome = 10; // The home range of the creature + private int m_RangeHome = 10; // The home range of the creature - List m_arSpellAttack; // List of attack spell/power - List m_arSpellDefense; // List of defensive spell/power + List m_SpellAttack; // List of attack spell/power + List m_SpellDefense; // List of defensive spell/power - private bool m_bControlled; // Is controlled + private bool m_Controlled; // Is controlled private Mobile m_ControlMaster; // My master private Mobile m_ControlTarget; // My target mobile private Point3D m_ControlDest; // My target destination (patrol) @@ -205,7 +205,7 @@ namespace Server.Mobiles private int m_Loyalty; - private double m_dMinTameSkill; + private double m_MinTameSkill; private bool m_bTamable; private bool m_bSummoned = false; @@ -254,6 +254,27 @@ namespace Server.Mobiles #endregion + public virtual string DefaultName{ get{ return null; } } + + [CommandProperty(AccessLevel.GameMaster)] + public override string Name + { + get + { + if (NameMod == null && Name == null) + return DefaultName; + + return base.Name; + } + set + { + if (value == DefaultName) + base.Name = null; + else + base.Name = value; + } + } + public virtual InhumanSpeech SpeechType{ get{ return null; } } /* Do not serialize this till the code is finalized */ @@ -345,7 +366,7 @@ namespace Server.Mobiles { return null; } - + public virtual bool CanShout { get { return false; } } public const int ShoutRange = 8; @@ -390,11 +411,11 @@ namespace Server.Mobiles public virtual TimeSpan BondingDelay{ get{ return TimeSpan.FromDays( 7.0 ); } } public virtual TimeSpan BondingAbandonDelay{ get{ return TimeSpan.FromDays( 1.0 ); } } - public override bool CanRegenHits{ get{ return !m_IsDeadPet && base.CanRegenHits; } } - public override bool CanRegenStam{ get{ return !IsParagon && !m_IsDeadPet && base.CanRegenStam; } } - public override bool CanRegenMana{ get{ return !m_IsDeadPet && base.CanRegenMana; } } + public override bool CanRegenHits => !m_IsDeadPet && base.CanRegenHits; + public override bool CanRegenStam => !IsParagon && !m_IsDeadPet && base.CanRegenStam; + public override bool CanRegenMana => !m_IsDeadPet && base.CanRegenMana; - public override bool IsDeadBondedPet{ get{ return m_IsDeadPet; } } + public override bool IsDeadBondedPet => m_IsDeadPet; private bool m_IsBonded; private bool m_IsDeadPet; @@ -922,7 +943,7 @@ namespace Server.Mobiles BaseCreature c = (BaseCreature)m; - return ( m_iTeam == c.m_iTeam && ( (m_bSummoned || m_bControlled) == (c.m_bSummoned || c.m_bControlled) )/* && c.Combatant != this */); + return ( m_Team == c.m_Team && ( (m_bSummoned || m_Controlled) == (c.m_bSummoned || c.m_Controlled) )/* && c.Combatant != this */); } #endregion @@ -998,7 +1019,7 @@ namespace Server.Mobiles if ( ( FightMode == FightMode.Evil && m.Karma < 0 ) || ( c.FightMode == FightMode.Evil && Karma < 0 ) ) return true; - return ( m_iTeam != c.m_iTeam || ( (m_bSummoned || m_bControlled) != (c.m_bSummoned || c.m_bControlled ) )/* || c.Combatant == this*/ ); + return ( m_Team != c.m_Team || ( (m_bSummoned || m_Controlled) != (c.m_bSummoned || c.m_Controlled ) )/* || c.Combatant == this*/ ); } public override string ApplyNameSuffix( string suffix ) @@ -1045,10 +1066,10 @@ namespace Server.Mobiles public virtual double GetControlChance( Mobile m, bool useBaseSkill ) { - if ( m_dMinTameSkill <= 29.1 || m_bSummoned || m.AccessLevel >= AccessLevel.GameMaster ) + if ( m_MinTameSkill <= 29.1 || m_bSummoned || m.AccessLevel >= AccessLevel.GameMaster ) return 1.0; - double dMinTameSkill = m_dMinTameSkill; + double dMinTameSkill = m_MinTameSkill; if ( dMinTameSkill > -24.9 && Server.SkillHandlers.AnimalTaming.CheckMastery( m, this ) ) dMinTameSkill = -24.9; @@ -1418,8 +1439,8 @@ namespace Server.Mobiles Seems this actually was removed on OSI somewhere between the original bug report and now. We will call it ML, until we can get better information. I suspect it was on the OSI TC when - originally it taken out of RunUO, and not implemented on OSIs production shards until more - recently. Either way, this is, or was, accurate OSI behavior, and just entirely + originally it taken out of RunUO, and not implemented on OSIs production shards until more + recently. Either way, this is, or was, accurate OSI behavior, and just entirely removing it was incorrect. OSI followers were distracted by being attacked well into AoS, at very least. @@ -1687,25 +1708,25 @@ namespace Server.Mobiles m_CurrentAI = ai; m_DefaultAI = ai; - m_iRangePerception = iRangePerception; - m_iRangeFight = iRangeFight; + m_RangePerception = iRangePerception; + m_RangeFight = iRangeFight; m_FightMode = mode; - m_iTeam = 0; + m_Team = 0; SpeedInfo.GetSpeeds( this, ref dActiveSpeed, ref dPassiveSpeed ); - m_dActiveSpeed = dActiveSpeed; - m_dPassiveSpeed = dPassiveSpeed; - m_dCurrentSpeed = dPassiveSpeed; + m_ActiveSpeed = dActiveSpeed; + m_PassiveSpeed = dPassiveSpeed; + m_CurrentSpeed = dPassiveSpeed; - m_bDebugAI = false; + m_DebugAI = false; - m_arSpellAttack = new List(); - m_arSpellDefense = new List(); + m_SpellAttack = new List(); + m_SpellDefense = new List(); - m_bControlled = false; + m_Controlled = false; m_ControlMaster = null; m_ControlTarget = null; m_ControlOrder = OrderType.None; @@ -1731,10 +1752,10 @@ namespace Server.Mobiles public BaseCreature( Serial serial ) : base( serial ) { - m_arSpellAttack = new List(); - m_arSpellDefense = new List(); + m_SpellAttack = new List(); + m_SpellDefense = new List(); - m_bDebugAI = false; + m_DebugAI = false; } public override void Serialize( GenericWriter writer ) @@ -1746,45 +1767,45 @@ namespace Server.Mobiles writer.Write( (int)m_CurrentAI ); writer.Write( (int)m_DefaultAI ); - writer.Write( (int)m_iRangePerception ); - writer.Write( (int)m_iRangeFight ); + writer.Write( (int)m_RangePerception ); + writer.Write( (int)m_RangeFight ); - writer.Write( (int)m_iTeam ); + writer.Write( (int)m_Team ); - writer.Write( (double)m_dActiveSpeed ); - writer.Write( (double)m_dPassiveSpeed ); - writer.Write( (double)m_dCurrentSpeed ); + writer.Write( (double)m_ActiveSpeed ); + writer.Write( (double)m_PassiveSpeed ); + writer.Write( (double)m_CurrentSpeed ); - writer.Write( (int) m_pHome.X ); - writer.Write( (int) m_pHome.Y ); - writer.Write( (int) m_pHome.Z ); + writer.Write( (int) m_Home.X ); + writer.Write( (int) m_Home.Y ); + writer.Write( (int) m_Home.Z ); // Version 1 - writer.Write( (int) m_iRangeHome ); + writer.Write( (int) m_RangeHome ); int i=0; - writer.Write( (int) m_arSpellAttack.Count ); - for ( i=0; i< m_arSpellAttack.Count; i++ ) + writer.Write( (int) m_SpellAttack.Count ); + for ( i=0; i< m_SpellAttack.Count; i++ ) { - writer.Write( m_arSpellAttack[i].ToString() ); + writer.Write( m_SpellAttack[i].ToString() ); } - writer.Write( (int) m_arSpellDefense.Count ); - for ( i=0; i< m_arSpellDefense.Count; i++ ) + writer.Write( (int) m_SpellDefense.Count ); + for ( i=0; i< m_SpellDefense.Count; i++ ) { - writer.Write( m_arSpellDefense[i].ToString() ); + writer.Write( m_SpellDefense[i].ToString() ); } // Version 2 writer.Write( (int) m_FightMode ); - writer.Write( (bool) m_bControlled ); + writer.Write( (bool) m_Controlled ); writer.Write( (Mobile) m_ControlMaster ); writer.Write( (Mobile) m_ControlTarget ); writer.Write( (Point3D) m_ControlDest ); writer.Write( (int) m_ControlOrder ); - writer.Write( (double) m_dMinTameSkill ); + writer.Write( (double) m_MinTameSkill ); // Removed in version 9 //writer.Write( (double) m_dMaxTameSkill ); writer.Write( (bool) m_bTamable ); @@ -1884,25 +1905,25 @@ namespace Server.Mobiles m_CurrentAI = (AIType)reader.ReadInt(); m_DefaultAI = (AIType)reader.ReadInt(); - m_iRangePerception = reader.ReadInt(); - m_iRangeFight = reader.ReadInt(); + m_RangePerception = reader.ReadInt(); + m_RangeFight = reader.ReadInt(); - m_iTeam = reader.ReadInt(); + m_Team = reader.ReadInt(); - m_dActiveSpeed = reader.ReadDouble(); - m_dPassiveSpeed = reader.ReadDouble(); - m_dCurrentSpeed = reader.ReadDouble(); + m_ActiveSpeed = reader.ReadDouble(); + m_PassiveSpeed = reader.ReadDouble(); + m_CurrentSpeed = reader.ReadDouble(); - if ( m_iRangePerception == OldRangePerception ) - m_iRangePerception = DefaultRangePerception; + if ( m_RangePerception == OldRangePerception ) + m_RangePerception = DefaultRangePerception; - m_pHome.X = reader.ReadInt(); - m_pHome.Y = reader.ReadInt(); - m_pHome.Z = reader.ReadInt(); + m_Home.X = reader.ReadInt(); + m_Home.Y = reader.ReadInt(); + m_Home.Z = reader.ReadInt(); if ( version >= 1 ) { - m_iRangeHome = reader.ReadInt(); + m_RangeHome = reader.ReadInt(); int i, iCount; @@ -1914,7 +1935,7 @@ namespace Server.Mobiles if ( type != null ) { - m_arSpellAttack.Add( type ); + m_SpellAttack.Add( type ); } } @@ -1926,26 +1947,26 @@ namespace Server.Mobiles if ( type != null ) { - m_arSpellDefense.Add( type ); + m_SpellDefense.Add( type ); } } } else { - m_iRangeHome = 0; + m_RangeHome = 0; } if ( version >= 2 ) { m_FightMode = ( FightMode )reader.ReadInt(); - m_bControlled = reader.ReadBool(); + m_Controlled = reader.ReadBool(); m_ControlMaster = reader.ReadMobile(); m_ControlTarget = reader.ReadMobile(); m_ControlDest = reader.ReadPoint3D(); m_ControlOrder = (OrderType) reader.ReadInt(); - m_dMinTameSkill = reader.ReadDouble(); + m_MinTameSkill = reader.ReadDouble(); if ( version < 9 ) reader.ReadDouble(); @@ -1965,7 +1986,7 @@ namespace Server.Mobiles { m_FightMode = FightMode.Closest; - m_bControlled = false; + m_Controlled = false; m_ControlMaster = null; m_ControlTarget = null; m_ControlOrder = OrderType.None; @@ -2040,29 +2061,29 @@ namespace Server.Mobiles if ( version < 16 && Loyalty != MaxLoyalty ) Loyalty *= 10; - double activeSpeed = m_dActiveSpeed; - double passiveSpeed = m_dPassiveSpeed; + double activeSpeed = m_ActiveSpeed; + double passiveSpeed = m_PassiveSpeed; SpeedInfo.GetSpeeds( this, ref activeSpeed, ref passiveSpeed ); bool isStandardActive = false; for ( int i = 0; !isStandardActive && i < m_StandardActiveSpeeds.Length; ++i ) - isStandardActive = ( m_dActiveSpeed == m_StandardActiveSpeeds[i] ); + isStandardActive = ( m_ActiveSpeed == m_StandardActiveSpeeds[i] ); bool isStandardPassive = false; for ( int i = 0; !isStandardPassive && i < m_StandardPassiveSpeeds.Length; ++i ) - isStandardPassive = ( m_dPassiveSpeed == m_StandardPassiveSpeeds[i] ); + isStandardPassive = ( m_PassiveSpeed == m_StandardPassiveSpeeds[i] ); - if ( isStandardActive && m_dCurrentSpeed == m_dActiveSpeed ) - m_dCurrentSpeed = activeSpeed; - else if ( isStandardPassive && m_dCurrentSpeed == m_dPassiveSpeed ) - m_dCurrentSpeed = passiveSpeed; + if ( isStandardActive && m_CurrentSpeed == m_ActiveSpeed ) + m_CurrentSpeed = activeSpeed; + else if ( isStandardPassive && m_CurrentSpeed == m_PassiveSpeed ) + m_CurrentSpeed = passiveSpeed; if ( isStandardActive && !m_Paragon ) - m_dActiveSpeed = activeSpeed; + m_ActiveSpeed = activeSpeed; if ( isStandardPassive && !m_Paragon ) - m_dPassiveSpeed = passiveSpeed; + m_PassiveSpeed = passiveSpeed; if ( version >= 14 ) { @@ -2157,7 +2178,7 @@ namespace Server.Mobiles return false; } - public override bool ShouldCheckStatTimers{ get{ return false; } } + public override bool ShouldCheckStatTimers => false; #region Food private static Type[] m_Eggs = new Type[] @@ -2298,7 +2319,7 @@ namespace Server.Mobiles if ( master != null && master == from ) //So friends can't start the bonding process { - if ( m_dMinTameSkill <= 29.1 || master.Skills[SkillName.AnimalTaming].Base >= m_dMinTameSkill || OverrideBondingReqs() || (Core.ML && master.Skills[SkillName.AnimalTaming].Value >= m_dMinTameSkill) ) + if ( m_MinTameSkill <= 29.1 || master.Skills[SkillName.AnimalTaming].Base >= m_MinTameSkill || OverrideBondingReqs() || (Core.ML && master.Skills[SkillName.AnimalTaming].Value >= m_MinTameSkill) ) { if ( BondingBegin == DateTime.MinValue ) { @@ -2460,11 +2481,11 @@ namespace Server.Mobiles { get { - return m_bDebugAI; + return m_DebugAI; } set { - m_bDebugAI = value; + m_DebugAI = value; } } @@ -2473,11 +2494,11 @@ namespace Server.Mobiles { get { - return m_iTeam; + return m_Team; } set { - m_iTeam = value; + m_Team = value; OnTeamChange(); } @@ -2518,11 +2539,11 @@ namespace Server.Mobiles { get { - return m_iRangePerception; + return m_RangePerception; } set { - m_iRangePerception = value; + m_RangePerception = value; } } @@ -2531,11 +2552,11 @@ namespace Server.Mobiles { get { - return m_iRangeFight; + return m_RangeFight; } set { - m_iRangeFight = value; + m_RangeFight = value; } } @@ -2544,11 +2565,11 @@ namespace Server.Mobiles { get { - return m_iRangeHome; + return m_RangeHome; } set { - m_iRangeHome = value; + m_RangeHome = value; } } @@ -2557,11 +2578,11 @@ namespace Server.Mobiles { get { - return m_dActiveSpeed; + return m_ActiveSpeed; } set { - m_dActiveSpeed = value; + m_ActiveSpeed = value; } } @@ -2570,11 +2591,11 @@ namespace Server.Mobiles { get { - return m_dPassiveSpeed; + return m_PassiveSpeed; } set { - m_dPassiveSpeed = value; + m_PassiveSpeed = value; } } @@ -2586,13 +2607,13 @@ namespace Server.Mobiles if ( m_TargetLocation != null ) return 0.3; - return m_dCurrentSpeed; + return m_CurrentSpeed; } set { - if ( m_dCurrentSpeed != value ) + if ( m_CurrentSpeed != value ) { - m_dCurrentSpeed = value; + m_CurrentSpeed = value; if (m_AI != null) m_AI.OnCurrentSpeedChanged(); @@ -2605,11 +2626,11 @@ namespace Server.Mobiles { get { - return m_pHome; + return m_Home; } set { - m_pHome = value; + m_Home = value; } } @@ -2631,14 +2652,14 @@ namespace Server.Mobiles { get { - return m_bControlled; + return m_Controlled; } set { - if ( m_bControlled == value ) + if ( m_Controlled == value ) return; - m_bControlled = value; + m_Controlled = value; Delta( MobileDelta.Noto ); InvalidateProperties(); @@ -2859,11 +2880,11 @@ namespace Server.Mobiles { get { - return m_dMinTameSkill; + return m_MinTameSkill; } set { - m_dMinTameSkill = value; + m_MinTameSkill = value; } } @@ -3003,13 +3024,13 @@ namespace Server.Mobiles public void DebugSay( string text ) { - if ( m_bDebugAI ) + if ( m_DebugAI ) this.PublicOverheadMessage( MessageType.Regular, 41, false, text ); } public void DebugSay( string format, params object[] args ) { - if ( m_bDebugAI ) + if ( m_DebugAI ) this.PublicOverheadMessage( MessageType.Regular, 41, false, String.Format( format, args ) ); } @@ -3065,7 +3086,7 @@ namespace Server.Mobiles public double GetHomeDistance() { - return GetDistanceToSqrt( m_pHome ); + return GetDistanceToSqrt( m_Home ); } public virtual int GetTeamSize(int iRange) @@ -3354,7 +3375,7 @@ namespace Server.Mobiles pl.FinishShield(); } - if ( aggressor.ChangingCombatant && (m_bControlled || m_bSummoned) && (ct == OrderType.Come || ( !Core.ML && ct == OrderType.Stay ) || ct == OrderType.Stop || ct == OrderType.None || ct == OrderType.Follow) ) + if ( aggressor.ChangingCombatant && (m_Controlled || m_bSummoned) && (ct == OrderType.Come || ( !Core.ML && ct == OrderType.Stay ) || ct == OrderType.Stop || ct == OrderType.None || ct == OrderType.Follow) ) { ControlTarget = aggressor; ControlOrder = OrderType.Attack; @@ -3396,7 +3417,7 @@ namespace Server.Mobiles if ( m_AI != null && Commandable ) m_AI.GetContextMenuEntries( from, list ); - if ( m_bTamable && !m_bControlled && from.Alive ) + if ( m_bTamable && !m_Controlled && from.Alive ) list.Add( new TameEntry( from, this ) ); AddCustomContextEntries( from, list ); @@ -3431,7 +3452,7 @@ namespace Server.Mobiles if ( speechType != null && (speechType.Flags & IHSFlags.OnSpeech) != 0 && from.InRange( this, 3 ) ) return true; - return ( m_AI != null && m_AI.HandlesOnSpeech( from ) && from.InRange( this, m_iRangePerception ) ); + return ( m_AI != null && m_AI.HandlesOnSpeech( from ) && from.InRange( this, m_RangePerception ) ); } public override void OnSpeech( SpeechEventArgs e ) @@ -3440,7 +3461,7 @@ namespace Server.Mobiles if ( speechType != null && speechType.OnSpeech( this, e.Mobile, e.Speech ) ) e.Handled = true; - else if ( !e.Handled && m_AI != null && e.Mobile.InRange( this, m_iRangePerception ) ) + else if ( !e.Handled && m_AI != null && e.Mobile.InRange( this, m_RangePerception ) ) m_AI.OnSpeech( e ); } @@ -3573,8 +3594,8 @@ namespace Server.Mobiles return true; // entered idle state } - /* - this way, due to the huge number of locations this will have to be changed + /* + this way, due to the huge number of locations this will have to be changed Perhaps we can change this in the future when fixing game play is not the major issue. */ @@ -3709,19 +3730,19 @@ namespace Server.Mobiles public void AddSpellAttack( Type type ) { - m_arSpellAttack.Add ( type ); + m_SpellAttack.Add ( type ); } public void AddSpellDefense( Type type ) { - m_arSpellDefense.Add ( type ); + m_SpellDefense.Add ( type ); } public Spell GetAttackSpellRandom() { - if ( m_arSpellAttack.Count > 0 ) + if ( m_SpellAttack.Count > 0 ) { - Type type = m_arSpellAttack[Utility.Random(m_arSpellAttack.Count)]; + Type type = m_SpellAttack[Utility.Random(m_SpellAttack.Count)]; object[] args = {this, null}; return Activator.CreateInstance( type, args ) as Spell; @@ -3734,9 +3755,9 @@ namespace Server.Mobiles public Spell GetDefenseSpellRandom() { - if ( m_arSpellDefense.Count > 0 ) + if ( m_SpellDefense.Count > 0 ) { - Type type = m_arSpellDefense[Utility.Random(m_arSpellDefense.Count)]; + Type type = m_SpellDefense[Utility.Random(m_SpellDefense.Count)]; object[] args = {this, null}; return Activator.CreateInstance( type, args ) as Spell; @@ -3751,18 +3772,18 @@ namespace Server.Mobiles { int i; - for( i=0; i< m_arSpellAttack.Count; i++ ) + for( i=0; i< m_SpellAttack.Count; i++ ) { - if( m_arSpellAttack[i] == type ) + if( m_SpellAttack[i] == type ) { object[] args = { this, null }; return Activator.CreateInstance( type, args ) as Spell; } } - for ( i=0; i< m_arSpellDefense.Count; i++ ) + for ( i=0; i< m_SpellDefense.Count; i++ ) { - if ( m_arSpellDefense[i] == type ) + if ( m_SpellDefense[i] == type ) { object[] args = {this, null}; return Activator.CreateInstance( type, args ) as Spell; @@ -5502,7 +5523,7 @@ namespace Server.Mobiles { if ( m_bBardProvoked && damagee == m_bBardTarget ) return m_bBardMaster; - else if ( m_bControlled && m_ControlMaster != null ) + else if ( m_Controlled && m_ControlMaster != null ) return m_ControlMaster; else if ( m_bSummoned && m_SummonMaster != null ) return m_SummonMaster; diff --git a/Scripts/Mobiles/Familiars/BaseFamiliar.cs b/Scripts/Mobiles/Familiars/BaseFamiliar.cs index 137a8498e..c8fc852d5 100644 --- a/Scripts/Mobiles/Familiars/BaseFamiliar.cs +++ b/Scripts/Mobiles/Familiars/BaseFamiliar.cs @@ -14,11 +14,11 @@ namespace Server.Mobiles { } - public override bool BardImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override bool Commandable{ get{ return false; } } + public override bool BardImmune => true; + public override Poison PoisonImmune => Poison.Lethal; + public override bool Commandable => false; - public override bool PlayerRangeSensitive { get { return false; } } + public override bool PlayerRangeSensitive => false; private bool m_LastHidden; @@ -181,4 +181,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Familiars/DarkWolf.cs b/Scripts/Mobiles/Familiars/DarkWolf.cs index 04c07c8b6..20ed2a003 100644 --- a/Scripts/Mobiles/Familiars/DarkWolf.cs +++ b/Scripts/Mobiles/Familiars/DarkWolf.cs @@ -10,9 +10,10 @@ namespace Server.Mobiles [CorpseName( "a dark wolf corpse" )] public class DarkWolfFamiliar : BaseFamiliar { + public override string DefaultName => "a dark wolf"; + public DarkWolfFamiliar() { - Name = "a dark wolf"; Body = 99; Hue = 0x901; BaseSoundID = 0xE5; @@ -79,4 +80,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Familiars/DeathAdder.cs b/Scripts/Mobiles/Familiars/DeathAdder.cs index 6415d72f2..a23a1e0e6 100644 --- a/Scripts/Mobiles/Familiars/DeathAdder.cs +++ b/Scripts/Mobiles/Familiars/DeathAdder.cs @@ -6,9 +6,10 @@ namespace Server.Mobiles [CorpseName( "a death adder corpse" )] public class DeathAdder : BaseFamiliar { + public override string DefaultName => "a death adder"; + public DeathAdder() { - Name = "a death adder"; Body = 0x15; Hue = 0x455; BaseSoundID = 219; @@ -35,7 +36,7 @@ namespace Server.Mobiles ControlSlots = 1; } - public override Poison HitPoison{ get{ return (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); } } + public override Poison HitPoison => (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); public DeathAdder( Serial serial ) : base( serial ) { @@ -55,4 +56,4 @@ namespace Server.Mobiles int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Familiars/HordeMinion.cs b/Scripts/Mobiles/Familiars/HordeMinion.cs index 5d03b1533..26631cd00 100644 --- a/Scripts/Mobiles/Familiars/HordeMinion.cs +++ b/Scripts/Mobiles/Familiars/HordeMinion.cs @@ -14,9 +14,10 @@ namespace Server.Mobiles { public override bool DisplayWeight{ get { return true; } } + public override string DefaultName => "a horde minion"; + public HordeMinionFamiliar() { - Name = "a horde minion"; Body = 776; BaseSoundID = 0x39D; @@ -199,4 +200,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Familiars/ShadowWisp.cs b/Scripts/Mobiles/Familiars/ShadowWisp.cs index 6ab57bf62..7ea7a10fe 100644 --- a/Scripts/Mobiles/Familiars/ShadowWisp.cs +++ b/Scripts/Mobiles/Familiars/ShadowWisp.cs @@ -10,9 +10,10 @@ namespace Server.Mobiles [CorpseName( "a shadow wisp corpse" )] public class ShadowWispFamiliar : BaseFamiliar { + public override string DefaultName => "a shadow wisp"; + public ShadowWispFamiliar() { - Name = "a shadow wisp"; Body = 165; Hue = 0x901; BaseSoundID = 466; @@ -113,4 +114,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Familiars/VampireBat.cs b/Scripts/Mobiles/Familiars/VampireBat.cs index bea77825c..3265f87ad 100644 --- a/Scripts/Mobiles/Familiars/VampireBat.cs +++ b/Scripts/Mobiles/Familiars/VampireBat.cs @@ -10,9 +10,10 @@ namespace Server.Mobiles [CorpseName( "a vampire bat corpse" )] public class VampireBatFamiliar : BaseFamiliar { + public override string DefaultName => "a vampire bat"; + public VampireBatFamiliar() { - Name = "a vampire bat"; Body = 317; BaseSoundID = 0x270; @@ -58,4 +59,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Healers/BaseHealer.cs b/Scripts/Mobiles/Healers/BaseHealer.cs index 56d47c5a1..acb3ab915 100644 --- a/Scripts/Mobiles/Healers/BaseHealer.cs +++ b/Scripts/Mobiles/Healers/BaseHealer.cs @@ -12,8 +12,8 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override bool IsActiveVendor{ get{ return false; } } - public override bool IsInvulnerable{ get{ return false; } } + public override bool IsActiveVendor => false; + public override bool IsInvulnerable => false; public override void InitSBInfo() { @@ -162,4 +162,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Healers/EvilHealer.cs b/Scripts/Mobiles/Healers/EvilHealer.cs index eabc2c504..19543c07b 100644 --- a/Scripts/Mobiles/Healers/EvilHealer.cs +++ b/Scripts/Mobiles/Healers/EvilHealer.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class EvilHealer : BaseHealer { - public override bool CanTeach{ get{ return true; } } + public override bool CanTeach => true; public override bool CheckTeach( SkillName skill, Mobile from ) { @@ -30,8 +30,8 @@ namespace Server.Mobiles SetSkill( SkillName.Swords, 80.0, 100.0 ); } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool IsActiveVendor{ get{ return true; } } + public override bool AlwaysMurderer => true; + public override bool IsActiveVendor => true; public override void InitSBInfo() { @@ -67,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Healers/EvilWanderingHealer.cs b/Scripts/Mobiles/Healers/EvilWanderingHealer.cs index 62c223a41..9580566d7 100644 --- a/Scripts/Mobiles/Healers/EvilWanderingHealer.cs +++ b/Scripts/Mobiles/Healers/EvilWanderingHealer.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class EvilWanderingHealer : BaseHealer { - public override bool CanTeach{ get{ return true; } } + public override bool CanTeach => true; public override bool CheckTeach( SkillName skill, Mobile from ) { @@ -33,8 +33,8 @@ namespace Server.Mobiles SetSkill( SkillName.SpiritSpeak, 80.0, 100.0 ); } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool ClickTitle{ get{ return false; } } // Do not display title in OnSingleClick + public override bool AlwaysMurderer => true; + public override bool ClickTitle => false; // Do not display title in OnSingleClick public override bool CheckResurrect( Mobile m ) { @@ -76,4 +76,4 @@ namespace Server.Mobiles Title = "the priest of Mondain"; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Healers/FortuneTeller.cs b/Scripts/Mobiles/Healers/FortuneTeller.cs index 8ecf338d9..af5e38d1d 100644 --- a/Scripts/Mobiles/Healers/FortuneTeller.cs +++ b/Scripts/Mobiles/Healers/FortuneTeller.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class FortuneTeller : BaseHealer { - public override bool CanTeach{ get{ return true; } } + public override bool CanTeach => true; public override bool CheckTeach( SkillName skill, Mobile from ) { @@ -31,8 +31,8 @@ namespace Server.Mobiles SetSkill( SkillName.SpiritSpeak, 65.0, 88.0 ); } - public override bool IsActiveVendor{ get{ return true; } } - public override bool IsInvulnerable{ get{ return true; } } + public override bool IsActiveVendor => true; + public override bool IsInvulnerable => true; public override void InitSBInfo() { @@ -77,4 +77,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Healers/Healer.cs b/Scripts/Mobiles/Healers/Healer.cs index b63b12974..804f8c2be 100644 --- a/Scripts/Mobiles/Healers/Healer.cs +++ b/Scripts/Mobiles/Healers/Healer.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Healer : BaseHealer { - public override bool CanTeach{ get{ return true; } } + public override bool CanTeach => true; public override bool CheckTeach( SkillName skill, Mobile from ) { @@ -31,8 +31,8 @@ namespace Server.Mobiles SetSkill( SkillName.Swords, 80.0, 100.0 ); } - public override bool IsActiveVendor{ get{ return true; } } - public override bool IsInvulnerable{ get{ return true; } } + public override bool IsActiveVendor => true; + public override bool IsInvulnerable => true; public override void InitSBInfo() { @@ -80,4 +80,4 @@ namespace Server.Mobiles NameHue = -1; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Healers/PricedHealer.cs b/Scripts/Mobiles/Healers/PricedHealer.cs index 8504f2939..05dcb5648 100644 --- a/Scripts/Mobiles/Healers/PricedHealer.cs +++ b/Scripts/Mobiles/Healers/PricedHealer.cs @@ -29,13 +29,13 @@ namespace Server.Mobiles NameHue = 0x35; } - public override bool IsInvulnerable{ get{ return true; } } + public override bool IsInvulnerable => true; public override void InitSBInfo() { } - public override bool HealsYoungPlayers{ get{ return false; } } + public override bool HealsYoungPlayers => false; public override void OfferResurrection( Mobile m ) { @@ -82,4 +82,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Healers/WanderingHealer.cs b/Scripts/Mobiles/Healers/WanderingHealer.cs index d29afed0e..bf0915eff 100644 --- a/Scripts/Mobiles/Healers/WanderingHealer.cs +++ b/Scripts/Mobiles/Healers/WanderingHealer.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class WanderingHealer : BaseHealer { - public override bool CanTeach{ get{ return true; } } + public override bool CanTeach => true; public override bool CheckTeach( SkillName skill, Mobile from ) { @@ -32,7 +32,7 @@ namespace Server.Mobiles SetSkill( SkillName.SpiritSpeak, 80.0, 100.0 ); } - public override bool ClickTitle{ get{ return false; } } // Do not display title in OnSingleClick + public override bool ClickTitle => false; // Do not display title in OnSingleClick public override bool CheckResurrect( Mobile m ) { @@ -72,4 +72,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/AbysmalHorror.cs b/Scripts/Mobiles/Monsters/AOS/AbysmalHorror.cs index 471364b5b..023d50dd9 100644 --- a/Scripts/Mobiles/Monsters/AOS/AbysmalHorror.cs +++ b/Scripts/Mobiles/Monsters/AOS/AbysmalHorror.cs @@ -7,17 +7,15 @@ namespace Server.Mobiles [CorpseName( "an abysmal horror corpse" )] public class AbysmalHorror : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.WhirlwindAttack; - } + public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.WhirlwindAttack; public override bool IgnoreYoungProtection { get { return Core.ML; } } + public override string DefaultName => "an abysmal horror"; + [Constructible] public AbysmalHorror() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an abysmal horror"; Body = 312; BaseSoundID = 0x451; @@ -64,10 +62,10 @@ namespace Server.Mobiles DemonKnight.DistributeArtifact( this ); } - public override bool BardImmune{ get{ return !Core.SE; } } - public override bool Unprovokable{ get{ return Core.SE; } } + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; public override bool AreaPeaceImmune { get { return Core.SE; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 1; } } public AbysmalHorror( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/AOS/BoneDemon.cs b/Scripts/Mobiles/Monsters/AOS/BoneDemon.cs index 50d3e818e..383001d1d 100644 --- a/Scripts/Mobiles/Monsters/AOS/BoneDemon.cs +++ b/Scripts/Mobiles/Monsters/AOS/BoneDemon.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a bone demon corpse" )] public class BoneDemon : BaseCreature { + public override string DefaultName => "a bone demon"; + [Constructible] public BoneDemon() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a bone demon"; Body = 308; BaseSoundID = 0x48D; @@ -53,7 +54,7 @@ namespace Server.Mobiles public override bool BardImmune { get { return !Core.SE; } } public override bool Unprovokable { get { return Core.SE; } } public override bool AreaPeaceImmune { get { return Core.SE; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 1; } } public BoneDemon( Serial serial ) : base( serial ) @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/CrystalElemental.cs b/Scripts/Mobiles/Monsters/AOS/CrystalElemental.cs index 607d52b10..d00ec50f0 100644 --- a/Scripts/Mobiles/Monsters/AOS/CrystalElemental.cs +++ b/Scripts/Mobiles/Monsters/AOS/CrystalElemental.cs @@ -7,15 +7,13 @@ namespace Server.Mobiles [CorpseName( "a crystal elemental corpse" )] public class CrystalElemental : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.BleedAttack; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack; + + public override string DefaultName => "a crystal elemental"; [Constructible] public CrystalElemental() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a crystal elemental"; Body = 300; BaseSoundID = 278; @@ -55,8 +53,8 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 1; } } public CrystalElemental( Serial serial ) : base( serial ) @@ -75,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/DarknightCreeper.cs b/Scripts/Mobiles/Monsters/AOS/DarknightCreeper.cs index 6069c4ec7..fe651c727 100644 --- a/Scripts/Mobiles/Monsters/AOS/DarknightCreeper.cs +++ b/Scripts/Mobiles/Monsters/AOS/DarknightCreeper.cs @@ -63,12 +63,12 @@ namespace Server.Mobiles DemonKnight.DistributeArtifact( this ); } - public override bool BardImmune{ get{ return !Core.SE; } } - public override bool Unprovokable{ get{ return Core.SE; } } + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; public override bool AreaPeaceImmune { get { return Core.SE; } } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override Poison HitPoison{ get{ return Poison.Lethal; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; + public override Poison HitPoison => Poison.Lethal; public override int TreasureMapLevel{ get{ return 1; } } @@ -91,4 +91,4 @@ namespace Server.Mobiles BaseSoundID = 0xE0; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs b/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs index 19545e44e..4c4b6e108 100644 --- a/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs +++ b/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs @@ -9,50 +9,51 @@ namespace Server.Mobiles [CorpseName( "a demon knight corpse" )] public class DemonKnight : BaseCreature { - public override bool IgnoreYoungProtection { get { return Core.ML; } } + public override bool IgnoreYoungProtection => Core.ML; - public static Type[] ArtifactRarity10 { get { return m_ArtifactRarity10; } } - public static Type[] ArtifactRarity11 { get { return m_ArtifactRarity11; } } - private static Type[] m_ArtifactRarity10 = new Type[] - { - typeof( LegacyOfTheDreadLord ), - typeof( TheTaskmaster ) - }; + public static Type[] ArtifactRarity10 => m_ArtifactRarity10; + public static Type[] ArtifactRarity11 => m_ArtifactRarity11; - private static Type[] m_ArtifactRarity11 = new Type[] - { - typeof( TheDragonSlayer ), - typeof( ArmorOfFortune ), - typeof( GauntletsOfNobility ), - typeof( HelmOfInsight ), - typeof( HolyKnightsBreastplate ), - typeof( JackalsCollar ), - typeof( LeggingsOfBane ), - typeof( MidnightBracers ), - typeof( OrnateCrownOfTheHarrower ), - typeof( ShadowDancerLeggings ), - typeof( TunicOfFire ), - typeof( VoiceOfTheFallenKing ), - typeof( BraceletOfHealth ), - typeof( OrnamentOfTheMagician ), - typeof( RingOfTheElements ), - typeof( RingOfTheVile ), - typeof( Aegis ), - typeof( ArcaneShield ), - typeof( AxeOfTheHeavens ), - typeof( BladeOfInsanity ), - typeof( BoneCrusher ), - typeof( BreathOfTheDead ), - typeof( Frostbringer ), - typeof( SerpentsFang ), - typeof( StaffOfTheMagi ), - typeof( TheBeserkersMaul ), - typeof( TheDryadBow ), - typeof( DivineCountenance ), - typeof( HatOfTheMagi ), - typeof( HuntersHeaddress ), - typeof( SpiritOfTheTotem ) - }; + private static Type[] m_ArtifactRarity10 = + { + typeof( LegacyOfTheDreadLord ), + typeof( TheTaskmaster ) + }; + + private static Type[] m_ArtifactRarity11 = + { + typeof( TheDragonSlayer ), + typeof( ArmorOfFortune ), + typeof( GauntletsOfNobility ), + typeof( HelmOfInsight ), + typeof( HolyKnightsBreastplate ), + typeof( JackalsCollar ), + typeof( LeggingsOfBane ), + typeof( MidnightBracers ), + typeof( OrnateCrownOfTheHarrower ), + typeof( ShadowDancerLeggings ), + typeof( TunicOfFire ), + typeof( VoiceOfTheFallenKing ), + typeof( BraceletOfHealth ), + typeof( OrnamentOfTheMagician ), + typeof( RingOfTheElements ), + typeof( RingOfTheVile ), + typeof( Aegis ), + typeof( ArcaneShield ), + typeof( AxeOfTheHeavens ), + typeof( BladeOfInsanity ), + typeof( BoneCrusher ), + typeof( BreathOfTheDead ), + typeof( Frostbringer ), + typeof( SerpentsFang ), + typeof( StaffOfTheMagi ), + typeof( TheBeserkersMaul ), + typeof( TheDryadBow ), + typeof( DivineCountenance ), + typeof( HatOfTheMagi ), + typeof( HuntersHeaddress ), + typeof( SpiritOfTheTotem ) + }; public static Item CreateRandomArtifact() { @@ -214,10 +215,10 @@ namespace Server.Mobiles AddLoot( LootPack.HighScrolls, Utility.RandomMinMax( 6, 60 ) ); } - public override bool BardImmune{ get{ return !Core.SE; } } - public override bool Unprovokable{ get{ return Core.SE; } } + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; public override bool AreaPeaceImmune { get { return Core.SE; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 1; } } @@ -264,11 +265,12 @@ namespace Server.Mobiles continue; } - UnholyBone bone = new UnholyBone(); - - bone.Hue = 0; - bone.Name = "unholy bones"; - bone.ItemID = Utility.Random( 0xECA, 9 ); + UnholyBone bone = new UnholyBone + { + Hue = 0, + Name = "unholy bones", + ItemID = Utility.Random(0xECA, 9), + }; bone.MoveToWorld( new Point3D( x, y, z ), map ); } @@ -290,4 +292,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/Devourer.cs b/Scripts/Mobiles/Monsters/AOS/Devourer.cs index 486f3522d..c547e6875 100644 --- a/Scripts/Mobiles/Monsters/AOS/Devourer.cs +++ b/Scripts/Mobiles/Monsters/AOS/Devourer.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a devourer of souls corpse" )] public class Devourer : BaseCreature { + public override string DefaultName => "a devourer of souls"; + [Constructible] public Devourer() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a devourer of souls"; Body = 303; BaseSoundID = 357; @@ -52,7 +53,7 @@ namespace Server.Mobiles AddLoot( LootPack.FilthyRich, 2 ); } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override int Meat{ get{ return 3; } } @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/FleshGolem.cs b/Scripts/Mobiles/Monsters/AOS/FleshGolem.cs index 640ffca95..e1454064f 100644 --- a/Scripts/Mobiles/Monsters/AOS/FleshGolem.cs +++ b/Scripts/Mobiles/Monsters/AOS/FleshGolem.cs @@ -7,15 +7,13 @@ namespace Server.Mobiles [CorpseName( "a flesh golem corpse" )] public class FleshGolem : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.BleedAttack; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack; + + public override string DefaultName => "a flesh golem"; [Constructible] public FleshGolem() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a flesh golem"; Body = 304; BaseSoundID = 684; @@ -50,7 +48,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 1; } } public FleshGolem( Serial serial ) : base( serial ) @@ -69,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/FleshRenderer.cs b/Scripts/Mobiles/Monsters/AOS/FleshRenderer.cs index a7a39e184..24025062b 100644 --- a/Scripts/Mobiles/Monsters/AOS/FleshRenderer.cs +++ b/Scripts/Mobiles/Monsters/AOS/FleshRenderer.cs @@ -7,17 +7,15 @@ namespace Server.Mobiles [CorpseName( "a fleshrenderer corpse" )] public class FleshRenderer : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return Utility.RandomBool() ? WeaponAbility.Dismount : WeaponAbility.ParalyzingBlow; - } + public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.Dismount : WeaponAbility.ParalyzingBlow; public override bool IgnoreYoungProtection { get { return Core.ML; } } + public override string DefaultName => "a fleshrenderer"; + [Constructible] public FleshRenderer() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a fleshrenderer"; Body = 315; SetStr( 401, 460 ); @@ -62,11 +60,11 @@ namespace Server.Mobiles DemonKnight.DistributeArtifact( this ); } - public override bool AutoDispel{ get{ return true; } } + public override bool AutoDispel => true; public override bool BardImmune { get { return !Core.SE; } } public override bool Unprovokable { get { return Core.SE; } } public override bool AreaPeaceImmune { get { return Core.SE; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 1; } } @@ -114,4 +112,4 @@ namespace Server.Mobiles BaseSoundID = -1; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/Gibberling.cs b/Scripts/Mobiles/Monsters/AOS/Gibberling.cs index 8de48aead..963bb8325 100644 --- a/Scripts/Mobiles/Monsters/AOS/Gibberling.cs +++ b/Scripts/Mobiles/Monsters/AOS/Gibberling.cs @@ -7,15 +7,13 @@ namespace Server.Mobiles [CorpseName( "a gibberling corpse" )] public class Gibberling : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.Dismount; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; + + public override string DefaultName => "a gibberling"; [Constructible] public Gibberling() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a gibberling"; Body = 307; BaseSoundID = 422; @@ -70,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/GoreFiend.cs b/Scripts/Mobiles/Monsters/AOS/GoreFiend.cs index 87e78e8e8..4fae9427e 100644 --- a/Scripts/Mobiles/Monsters/AOS/GoreFiend.cs +++ b/Scripts/Mobiles/Monsters/AOS/GoreFiend.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a gore fiend corpse" )] public class GoreFiend : BaseCreature { + public override string DefaultName => "a gore fiend"; + [Constructible] public GoreFiend() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a gore fiend"; Body = 305; BaseSoundID = 224; @@ -51,7 +52,7 @@ namespace Server.Mobiles return 1218; } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public GoreFiend( Serial serial ) : base( serial ) { @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/Impaler.cs b/Scripts/Mobiles/Monsters/AOS/Impaler.cs index 578ec27ec..09b8a8f00 100644 --- a/Scripts/Mobiles/Monsters/AOS/Impaler.cs +++ b/Scripts/Mobiles/Monsters/AOS/Impaler.cs @@ -7,10 +7,7 @@ namespace Server.Mobiles [CorpseName( "an impaler corpse" )] public class Impaler : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.BleedAttack; - } + public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.BleedAttack; public override bool IgnoreYoungProtection { get { return Core.ML; } } @@ -63,12 +60,12 @@ namespace Server.Mobiles DemonKnight.DistributeArtifact( this ); } - public override bool AutoDispel{ get{ return true; } } - public override bool BardImmune{ get{ return !Core.SE; } } - public override bool Unprovokable{ get{ return Core.SE; } } + public override bool AutoDispel => true; + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; public override bool AreaPeaceImmune { get { return Core.SE; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override Poison HitPoison{ get{ return (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); } } + public override Poison PoisonImmune => Poison.Lethal; + public override Poison HitPoison => (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); public override int TreasureMapLevel{ get{ return 1; } } @@ -91,4 +88,4 @@ namespace Server.Mobiles BaseSoundID = 0x2A7; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/MoundOfMaggots.cs b/Scripts/Mobiles/Monsters/AOS/MoundOfMaggots.cs index e549cdf23..9a02f0ffb 100644 --- a/Scripts/Mobiles/Monsters/AOS/MoundOfMaggots.cs +++ b/Scripts/Mobiles/Monsters/AOS/MoundOfMaggots.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a maggoty corpse" )] // TODO: Corpse name? public class MoundOfMaggots : BaseCreature { + public override string DefaultName => "a mound of maggots"; + [Constructible] public MoundOfMaggots() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a mound of maggots"; Body = 319; BaseSoundID = 898; @@ -43,7 +44,7 @@ namespace Server.Mobiles AddLoot( LootPack.Gems ); } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 1; } } @@ -63,4 +64,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/PatchworkSkeleton.cs b/Scripts/Mobiles/Monsters/AOS/PatchworkSkeleton.cs index 8fc154fa4..ddd101dc3 100644 --- a/Scripts/Mobiles/Monsters/AOS/PatchworkSkeleton.cs +++ b/Scripts/Mobiles/Monsters/AOS/PatchworkSkeleton.cs @@ -7,15 +7,13 @@ namespace Server.Mobiles [CorpseName( "a patchwork skeletal corpse" )] public class PatchworkSkeleton : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.Dismount; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; + + public override string DefaultName => "a patchwork skeleton"; [Constructible] public PatchworkSkeleton() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a patchwork skeleton"; Body = 309; BaseSoundID = 0x48D; @@ -51,8 +49,8 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 1; } } @@ -72,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/Ravager.cs b/Scripts/Mobiles/Monsters/AOS/Ravager.cs index cb9ffe670..09d29de6e 100644 --- a/Scripts/Mobiles/Monsters/AOS/Ravager.cs +++ b/Scripts/Mobiles/Monsters/AOS/Ravager.cs @@ -7,15 +7,13 @@ namespace Server.Mobiles [CorpseName( "a ravager corpse" )] public class Ravager : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return Utility.RandomBool() ? WeaponAbility.Dismount : WeaponAbility.CrushingBlow; - } + public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.Dismount : WeaponAbility.CrushingBlow; + + public override string DefaultName => "a ravager"; [Constructible] public Ravager() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a ravager"; Body = 314; BaseSoundID = 357; @@ -66,4 +64,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/Revenant.cs b/Scripts/Mobiles/Monsters/AOS/Revenant.cs index ab17e5777..7a95c6e7f 100644 --- a/Scripts/Mobiles/Monsters/AOS/Revenant.cs +++ b/Scripts/Mobiles/Monsters/AOS/Revenant.cs @@ -16,14 +16,15 @@ namespace Server.Mobiles } public override Mobile ConstantFocus{ get{ return m_Target; } } - public override bool NoHouseRestrictions{ get{ return true; } } + public override bool NoHouseRestrictions => true; public override double DispelDifficulty{ get{ return 80.0; } } public override double DispelFocus{ get{ return 20.0; } } + public override string DefaultName => "a revenant"; + public Revenant( Mobile caster, Mobile target, TimeSpan duration ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.18, 0.36 ) { - Name = "a revenant"; Body = 400; Hue = 1; // TODO: Sound values? @@ -78,11 +79,11 @@ namespace Server.Mobiles AddItem( weapon ); } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; - public override bool BleedImmune{ get{ return true; } } - public override bool BardImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BleedImmune => true; + public override bool BardImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public override void OnThink() { @@ -180,4 +181,4 @@ namespace Server.Mobiles Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs b/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs index 85ed9832c..4b93c0ded 100644 --- a/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs +++ b/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs @@ -7,10 +7,7 @@ namespace Server.Mobiles [CorpseName( "a shadow knight corpse" )] public class ShadowKnight : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return Utility.RandomBool() ? WeaponAbility.ConcussionBlow : WeaponAbility.CrushingBlow; - } + public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.ConcussionBlow : WeaponAbility.CrushingBlow; public override bool IgnoreYoungProtection { get { return Core.ML; } } @@ -167,10 +164,10 @@ namespace Server.Mobiles base.OnThink(); } - public override bool BardImmune{ get{ return !Core.SE; } } - public override bool Unprovokable{ get{ return Core.SE; } } - public override bool AreaPeaceImmune{ get{ return Core.SE; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; + public override bool AreaPeaceImmune => Core.SE; + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 1; } } @@ -193,4 +190,4 @@ namespace Server.Mobiles BaseSoundID = -1; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/SkitteringHopper.cs b/Scripts/Mobiles/Monsters/AOS/SkitteringHopper.cs index ddaea8c88..e2c935eaf 100644 --- a/Scripts/Mobiles/Monsters/AOS/SkitteringHopper.cs +++ b/Scripts/Mobiles/Monsters/AOS/SkitteringHopper.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a skittering hopper corpse" )] public class SkitteringHopper : BaseCreature { + public override string DefaultName => "a skittering hopper"; + [Constructible] public SkitteringHopper() : base( AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a skittering hopper"; Body = 302; BaseSoundID = 959; @@ -65,4 +66,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/Treefellow.cs b/Scripts/Mobiles/Monsters/AOS/Treefellow.cs index 6106b881a..bb31f32ef 100644 --- a/Scripts/Mobiles/Monsters/AOS/Treefellow.cs +++ b/Scripts/Mobiles/Monsters/AOS/Treefellow.cs @@ -7,15 +7,13 @@ namespace Server.Mobiles [CorpseName( "a treefellow corpse" )] public class Treefellow : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.Dismount; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; + + public override string DefaultName => "a treefellow"; [Constructible] public Treefellow() : base( AIType.AI_Melee, FightMode.Evil, 10, 1, 0.2, 0.4 ) { - Name = "a treefellow"; Body = 301; SetStr( 196, 220 ); @@ -64,7 +62,7 @@ namespace Server.Mobiles return 672; } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override void GenerateLoot() { @@ -90,4 +88,4 @@ namespace Server.Mobiles BaseSoundID = -1; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/VampireBat.cs b/Scripts/Mobiles/Monsters/AOS/VampireBat.cs index 7d543f4e5..ae8d8fdee 100644 --- a/Scripts/Mobiles/Monsters/AOS/VampireBat.cs +++ b/Scripts/Mobiles/Monsters/AOS/VampireBat.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a vampire bat corpse" )] public class VampireBat : BaseCreature { + public override string DefaultName => "a vampire bat"; + [Constructible] public VampireBat() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a vampire bat"; Body = 317; BaseSoundID = 0x270; @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/WailingBanshee.cs b/Scripts/Mobiles/Monsters/AOS/WailingBanshee.cs index 03dfd42f9..179c70275 100644 --- a/Scripts/Mobiles/Monsters/AOS/WailingBanshee.cs +++ b/Scripts/Mobiles/Monsters/AOS/WailingBanshee.cs @@ -7,15 +7,13 @@ namespace Server.Mobiles [CorpseName( "a wailing banshee corpse" )] public class WailingBanshee : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.MortalStrike; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike; + + public override string DefaultName => "a wailing banshee"; [Constructible] public WailingBanshee() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a wailing banshee"; Body = 310; BaseSoundID = 0x482; @@ -52,7 +50,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public WailingBanshee( Serial serial ) : base( serial ) { @@ -70,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/AOS/WandererOfTheVoid.cs b/Scripts/Mobiles/Monsters/AOS/WandererOfTheVoid.cs index 2e8b6c893..99c3a1a14 100644 --- a/Scripts/Mobiles/Monsters/AOS/WandererOfTheVoid.cs +++ b/Scripts/Mobiles/Monsters/AOS/WandererOfTheVoid.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a wanderer of the void corpse" )] public class WandererOfTheVoid : BaseCreature { + public override string DefaultName => "a wanderer of the void"; + [Constructible] public WandererOfTheVoid() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a wanderer of the void"; Body = 316; BaseSoundID = 377; @@ -50,8 +51,8 @@ namespace Server.Mobiles PackItem( new TreasureMap( 3, Map.Trammel ) ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return Core.AOS ? 4 : 1; } } public override void GenerateLoot() @@ -75,4 +76,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/AntLion.cs b/Scripts/Mobiles/Monsters/Ants/AntLion.cs index 0c122394a..3a7b27152 100644 --- a/Scripts/Mobiles/Monsters/Ants/AntLion.cs +++ b/Scripts/Mobiles/Monsters/Ants/AntLion.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "an ant lion corpse" )] public class AntLion : BaseCreature { + public override string DefaultName => "an ant lion"; + [Constructible] public AntLion() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an ant lion"; Body = 787; BaseSoundID = 1006; @@ -110,4 +111,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/BlackSolenInfiltratorQueen.cs b/Scripts/Mobiles/Monsters/Ants/BlackSolenInfiltratorQueen.cs index e0af73a63..427016b75 100644 --- a/Scripts/Mobiles/Monsters/Ants/BlackSolenInfiltratorQueen.cs +++ b/Scripts/Mobiles/Monsters/Ants/BlackSolenInfiltratorQueen.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a solen infiltrator corpse" )] // TODO: Corpse name? public class BlackSolenInfiltratorQueen : BaseCreature { + public override string DefaultName => "a black solen infiltrator"; + [Constructible] public BlackSolenInfiltratorQueen() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a black solen infiltrator"; Body = 807; BaseSoundID = 959; Hue = 0x453; @@ -108,4 +109,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/BlackSolenInfiltratorWarrior.cs b/Scripts/Mobiles/Monsters/Ants/BlackSolenInfiltratorWarrior.cs index 3ee1c1bb4..6710b24e3 100644 --- a/Scripts/Mobiles/Monsters/Ants/BlackSolenInfiltratorWarrior.cs +++ b/Scripts/Mobiles/Monsters/Ants/BlackSolenInfiltratorWarrior.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a solen infiltrator corpse" )] public class BlackSolenInfiltratorWarrior : BaseCreature { + public override string DefaultName => "a black solen infiltrator"; + [Constructible] public BlackSolenInfiltratorWarrior() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a black solen infiltrator"; Body = 806; BaseSoundID = 959; Hue = 0x453; @@ -44,7 +45,7 @@ namespace Server.Mobiles SolenHelper.PackPicnicBasket( this ); - PackItem( new ZoogiFungus( ( 0.05 > Utility.RandomDouble() )? 13 : 3 ) ); + PackItem( new ZoogiFungus( ( 0.05 > Utility.RandomDouble() )? 13 : 3 ) ); } public override int GetAngerSound() @@ -109,4 +110,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/BlackSolenQueen.cs b/Scripts/Mobiles/Monsters/Ants/BlackSolenQueen.cs index afe4d95f1..85c98b056 100644 --- a/Scripts/Mobiles/Monsters/Ants/BlackSolenQueen.cs +++ b/Scripts/Mobiles/Monsters/Ants/BlackSolenQueen.cs @@ -11,10 +11,11 @@ namespace Server.Mobiles private bool m_BurstSac; public bool BurstSac{ get{ return m_BurstSac; } } + public override string DefaultName => "a black solen queen"; + [Constructible] public BlackSolenQueen() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a black solen queen"; Body = 807; BaseSoundID = 959; Hue = 0x453; @@ -144,7 +145,7 @@ namespace Server.Mobiles m_BurstSac = reader.ReadBool(); break; } - } + } } } } diff --git a/Scripts/Mobiles/Monsters/Ants/BlackSolenWarrior.cs b/Scripts/Mobiles/Monsters/Ants/BlackSolenWarrior.cs index 9e8434b07..f3d92f005 100644 --- a/Scripts/Mobiles/Monsters/Ants/BlackSolenWarrior.cs +++ b/Scripts/Mobiles/Monsters/Ants/BlackSolenWarrior.cs @@ -11,10 +11,11 @@ namespace Server.Mobiles private bool m_BurstSac; public bool BurstSac{ get{ return m_BurstSac; } } + public override string DefaultName => "a black solen warrior"; + [Constructible] public BlackSolenWarrior() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a black solen warrior"; Body = 806; BaseSoundID = 959; Hue = 0x453; @@ -145,7 +146,7 @@ namespace Server.Mobiles m_BurstSac = reader.ReadBool(); break; } - } + } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/BlackSolenWorker.cs b/Scripts/Mobiles/Monsters/Ants/BlackSolenWorker.cs index 0813dca00..629e7dadb 100644 --- a/Scripts/Mobiles/Monsters/Ants/BlackSolenWorker.cs +++ b/Scripts/Mobiles/Monsters/Ants/BlackSolenWorker.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a solen worker corpse" )] public class BlackSolenWorker : BaseCreature { + public override string DefaultName => "a black solen worker"; + [Constructible] public BlackSolenWorker() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a black solen worker"; Body = 805; BaseSoundID = 959; Hue = 0x453; @@ -109,4 +110,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/RedSolenInfiltratorQueen.cs b/Scripts/Mobiles/Monsters/Ants/RedSolenInfiltratorQueen.cs index ea120472e..458a67b46 100644 --- a/Scripts/Mobiles/Monsters/Ants/RedSolenInfiltratorQueen.cs +++ b/Scripts/Mobiles/Monsters/Ants/RedSolenInfiltratorQueen.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a solen infiltrator corpse" )] // TODO: Corpse name? public class RedSolenInfiltratorQueen : BaseCreature { + public override string DefaultName => "a red solen infiltrator"; + [Constructible] public RedSolenInfiltratorQueen() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a red solen infiltrator"; Body = 783; BaseSoundID = 959; @@ -107,4 +108,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/RedSolenInfiltratorWarrior.cs b/Scripts/Mobiles/Monsters/Ants/RedSolenInfiltratorWarrior.cs index 1c7f380b3..606a7aaca 100644 --- a/Scripts/Mobiles/Monsters/Ants/RedSolenInfiltratorWarrior.cs +++ b/Scripts/Mobiles/Monsters/Ants/RedSolenInfiltratorWarrior.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a solen infiltrator corpse" )] public class RedSolenInfiltratorWarrior : BaseCreature { + public override string DefaultName => "a red solen infiltrator"; + [Constructible] public RedSolenInfiltratorWarrior() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a red solen infiltrator"; Body = 782; BaseSoundID = 959; @@ -44,7 +45,7 @@ namespace Server.Mobiles SolenHelper.PackPicnicBasket( this ); PackItem( new ZoogiFungus( ( 0.05 < Utility.RandomDouble() )? 3 : 13 ) ); - + } public override int GetAngerSound() @@ -109,4 +110,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/RedSolenQueen.cs b/Scripts/Mobiles/Monsters/Ants/RedSolenQueen.cs index 716fc5ac9..e93cea9f7 100644 --- a/Scripts/Mobiles/Monsters/Ants/RedSolenQueen.cs +++ b/Scripts/Mobiles/Monsters/Ants/RedSolenQueen.cs @@ -11,10 +11,11 @@ namespace Server.Mobiles private bool m_BurstSac; public bool BurstSac{ get{ return m_BurstSac; } } + public override string DefaultName => "a red solen queen"; + [Constructible] public RedSolenQueen() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a red solen queen"; Body = 783; BaseSoundID = 959; @@ -144,7 +145,7 @@ namespace Server.Mobiles m_BurstSac = reader.ReadBool(); break; } - } + } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/RedSolenWarrior.cs b/Scripts/Mobiles/Monsters/Ants/RedSolenWarrior.cs index d66e897b1..9e7481283 100644 --- a/Scripts/Mobiles/Monsters/Ants/RedSolenWarrior.cs +++ b/Scripts/Mobiles/Monsters/Ants/RedSolenWarrior.cs @@ -11,10 +11,11 @@ namespace Server.Mobiles private bool m_BurstSac; public bool BurstSac{ get{ return m_BurstSac; } } + public override string DefaultName => "a red solen warrior"; + [Constructible] public RedSolenWarrior() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a red solen warrior"; Body = 782; BaseSoundID = 959; @@ -144,7 +145,7 @@ namespace Server.Mobiles m_BurstSac = reader.ReadBool(); break; } - } + } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ants/RedSolenWorker.cs b/Scripts/Mobiles/Monsters/Ants/RedSolenWorker.cs index 8304f46c1..7d540b872 100644 --- a/Scripts/Mobiles/Monsters/Ants/RedSolenWorker.cs +++ b/Scripts/Mobiles/Monsters/Ants/RedSolenWorker.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a solen worker corpse" )] public class RedSolenWorker : BaseCreature { + public override string DefaultName => "a red solen worker"; + [Constructible] public RedSolenWorker() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a red solen worker"; Body = 781; BaseSoundID = 959; @@ -108,4 +109,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs b/Scripts/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs index 82ae68d6c..486a90e4e 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a dread spider corpse" )] public class DreadSpider : BaseCreature { + public override string DefaultName => "a dread spider"; + [Constructible] public DreadSpider () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a dread spider"; Body = 11; BaseSoundID = 1170; @@ -51,8 +52,8 @@ namespace Server.Mobiles AddLoot( LootPack.FilthyRich ); } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override Poison HitPoison{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; + public override Poison HitPoison => Poison.Lethal; public override int TreasureMapLevel{ get{ return 3; } } public DreadSpider( Serial serial ) : base( serial ) @@ -74,4 +75,4 @@ namespace Server.Mobiles BaseSoundID = 1170; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs b/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs index 2cbfb9c29..d4c99e260 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a terathan avenger corpse" )] public class TerathanAvenger : BaseCreature { + public override string DefaultName => "a terathan avenger"; + [Constructible] public TerathanAvenger() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a terathan avenger"; Body = 152; BaseSoundID = 0x24D; @@ -50,8 +51,8 @@ namespace Server.Mobiles AddLoot( LootPack.Rich, 2 ); } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } - public override Poison HitPoison{ get{ return Poison.Deadly; } } + public override Poison PoisonImmune => Poison.Deadly; + public override Poison HitPoison => Poison.Deadly; public override int TreasureMapLevel{ get{ return 3; } } public override int Meat{ get{ return 2; } } diff --git a/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs b/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs index eae461648..ab3c1946d 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a terathan matriarch corpse" )] public class TerathanMatriarch : BaseCreature { + public override string DefaultName => "a terathan matriarch"; + [Constructible] public TerathanMatriarch() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a terathan matriarch"; Body = 72; BaseSoundID = 599; @@ -74,4 +75,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs index ffa04319c..d25fcce65 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a frost spider corpse" )] public class FrostSpider : BaseCreature { + public override string DefaultName => "a frost spider"; + [Constructible] public FrostSpider() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a frost spider"; Body = 20; BaseSoundID = 0x388; @@ -38,7 +39,7 @@ namespace Server.Mobiles Fame = 775; Karma = -775; - VirtualArmor = 28; + VirtualArmor = 28; Tamable = true; ControlSlots = 1; @@ -75,4 +76,4 @@ namespace Server.Mobiles BaseSoundID = 0x388; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs index bd40fe52e..04d0767fb 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a giant black widow spider corpse" )] // stupid corpse name public class GiantBlackWidow : BaseCreature { + public override string DefaultName => "a giant black wide"; + [Constructible] public GiantBlackWidow() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a giant black widow"; Body = 0x9D; BaseSoundID = 0x388; // TODO: validate @@ -53,8 +54,8 @@ namespace Server.Mobiles } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } - public override Poison HitPoison{ get{ return Poison.Deadly; } } + public override Poison PoisonImmune => Poison.Deadly; + public override Poison HitPoison => Poison.Deadly; public GiantBlackWidow( Serial serial ) : base( serial ) { @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs index 09a6e2a18..5db1e672c 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a giant spider corpse" )] public class GiantSpider : BaseCreature { + public override string DefaultName => "a giant spider"; + [Constructible] public GiantSpider() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a giant spider"; Body = 28; BaseSoundID = 0x388; @@ -53,8 +54,8 @@ namespace Server.Mobiles public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } public override PackInstinct PackInstinct{ get{ return PackInstinct.Arachnid; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } - public override Poison HitPoison{ get{ return Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; + public override Poison HitPoison => Poison.Regular; public GiantSpider( Serial serial ) : base( serial ) { @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs index 9531e69e9..5f2b77e67 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a terathan drone corpse" )] public class TerathanDrone : BaseCreature { + public override string DefaultName => "a terathan drone"; + [Constructible] public TerathanDrone() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a terathan drone"; Body = 71; BaseSoundID = 594; @@ -41,7 +42,7 @@ namespace Server.Mobiles Karma = -2000; VirtualArmor = 24; - + PackItem( new SpidersSilk( 2 ) ); } @@ -77,4 +78,4 @@ namespace Server.Mobiles BaseSoundID = 594; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs index 82202b0cf..09529d34d 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a terathan warrior corpse" )] public class TerathanWarrior : BaseCreature { + public override string DefaultName => "a terathan warrior"; + [Constructible] public TerathanWarrior() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a terathan warrior"; Body = 70; BaseSoundID = 589; @@ -75,4 +76,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs index b5232340d..0942279bb 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "an acid elemental corpse" )] public class AcidElemental : BaseCreature { + public override string DefaultName => "an acid elemental"; + [Constructible] public AcidElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an acid elemental"; Body = 0x9E; BaseSoundID = 278; @@ -52,8 +53,8 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison HitPoison{ get{ return Poison.Lethal; } } + public override bool BleedImmune => true; + public override Poison HitPoison => Poison.Lethal; public override double HitPoisonChance{ get{ return 0.6; } } public override int TreasureMapLevel{ get{ return Core.AOS ? 2 : 3; } } @@ -84,4 +85,4 @@ namespace Server.Mobiles Hue = 0; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/AirElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/AirElemental.cs index 537d11da7..fb551c30d 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/AirElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/AirElemental.cs @@ -10,10 +10,11 @@ namespace Server.Mobiles public override double DispelDifficulty{ get{ return 117.5; } } public override double DispelFocus{ get{ return 45.0; } } + public override string DefaultName => "an air elemental"; + [Constructible] public AirElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an air elemental"; Body = 13; Hue = 0x4001; BaseSoundID = 655; @@ -57,7 +58,7 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 2; } } public AirElemental( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs index 1aa866a7c..d6ec96fb2 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a blood elemental corpse" )] public class BloodElemental : BaseCreature { + public override string DefaultName => "a blood elemental"; + [Constructible] public BloodElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a blood elemental"; Body = 159; BaseSoundID = 278; @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/Efreet.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/Efreet.cs index a2bd245bb..cba094834 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/Efreet.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/Efreet.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "an efreet corpse" )] public class Efreet : BaseCreature { + public override string DefaultName => "an efreet"; + [Constructible] public Efreet () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an efreet"; Body = 131; BaseSoundID = 768; diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/FireElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/FireElemental.cs index 153750281..c75d869a5 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/FireElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/FireElemental.cs @@ -10,10 +10,11 @@ namespace Server.Mobiles public override double DispelDifficulty{ get{ return 117.5; } } public override double DispelFocus{ get{ return 45.0; } } + public override string DefaultName => "a fire elemental"; + [Constructible] public FireElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a fire elemental"; Body = 15; BaseSoundID = 838; @@ -58,7 +59,7 @@ namespace Server.Mobiles AddLoot( LootPack.Gems ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 2; } } public FireElemental( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/IceElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/IceElemental.cs index 0dcbf469d..285a1544d 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/IceElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/IceElemental.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "an ice elemental corpse" )] public class IceElemental : BaseCreature { + public override string DefaultName => "an ice elemental"; + [Constructible] public IceElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an ice elemental"; Body = 161; BaseSoundID = 268; @@ -51,7 +52,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average, 2 ); AddLoot( LootPack.Gems, 2 ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public IceElemental( Serial serial ) : base( serial ) { @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs index d7a4f7d65..6aa99b2c5 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a poison elementals corpse" )] public class PoisonElemental : BaseCreature { + public override string DefaultName => "a poison elemental"; + [Constructible] public PoisonElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a poison elemental"; Body = 162; BaseSoundID = 263; @@ -55,10 +56,10 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; - public override Poison HitPoison{ get{ return Poison.Lethal; } } + public override Poison HitPoison => Poison.Lethal; public override double HitPoisonChance{ get{ return 0.75; } } public override int TreasureMapLevel{ get{ return 5; } } @@ -79,4 +80,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs index 7592bdf35..f5be5a6d3 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs @@ -10,10 +10,11 @@ namespace Server.Mobiles public override double DispelDifficulty{ get{ return 117.5; } } public override double DispelFocus{ get{ return 45.0; } } + public override string DefaultName => "a water elemental"; + [Constructible] public WaterElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a water elemental"; Body = 16; BaseSoundID = 278; @@ -56,7 +57,7 @@ namespace Server.Mobiles AddLoot( LootPack.Potions ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 2; } } public WaterElemental( Serial serial ) : base( serial ) @@ -75,4 +76,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs index 75cfd1736..9f841ebe8 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs @@ -11,10 +11,11 @@ namespace Server.Mobiles public override double DispelDifficulty{ get{ return 117.5; } } public override double DispelFocus{ get{ return 45.0; } } + public override string DefaultName => "an earth elemental"; + [Constructible] public EarthElemental() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an earth elemental"; Body = 14; BaseSoundID = 268; @@ -46,7 +47,7 @@ namespace Server.Mobiles PackItem( new FertileDirt( Utility.RandomMinMax( 1, 4 ) ) ); PackItem( new MandrakeRoot() ); - + Item ore = new IronOre( 5 ); ore.ItemID = 0x19B7; PackItem( ore ); @@ -59,7 +60,7 @@ namespace Server.Mobiles AddLoot( LootPack.Gems ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 1; } } public EarthElemental( Serial serial ) : base( serial ) @@ -78,4 +79,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs index 0d0cf9d4a..7e5c44e61 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a snow elemental corpse" )] public class SnowElemental : BaseCreature { + public override string DefaultName => "a snow elemental"; + [Constructible] public SnowElemental() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a snow elemental"; Body = 163; BaseSoundID = 263; @@ -50,7 +51,7 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return Utility.RandomList( 2, 3 ); } } @@ -70,4 +71,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs index bedfa3c8c..b89b31695 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs @@ -47,7 +47,7 @@ namespace Server.Mobiles VirtualArmor = 60; PackNecroReg( 30, 275 ); - + } public override OppositionGroup OppositionGroup @@ -86,15 +86,15 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override bool Unprovokable{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool Unprovokable => true; + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 5; } } public AncientLich( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/ArcaneDaemon.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/ArcaneDaemon.cs index 8afac317b..152628233 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/ArcaneDaemon.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/ArcaneDaemon.cs @@ -6,15 +6,13 @@ namespace Server.Mobiles [CorpseName( "an arcane daemon corpse" )] public class ArcaneDaemon : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ConcussionBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.ConcussionBlow; + + public override string DefaultName => "an arcane daemon"; [Constructible] public ArcaneDaemon() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an arcane daemon"; Body = 0x310; BaseSoundID = 0x47D; @@ -53,7 +51,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average, 2 ); } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } + public override Poison PoisonImmune => Poison.Deadly; public ArcaneDaemon( Serial serial ) : base( serial ) { @@ -71,4 +69,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Balron.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Balron.cs index 757845faf..c4ea56840 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Balron.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Balron.cs @@ -55,8 +55,8 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override bool CanRummageCorpses{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } + public override bool CanRummageCorpses => true; + public override Poison PoisonImmune => Poison.Deadly; public override int TreasureMapLevel{ get{ return 5; } } public override int Meat{ get{ return 1; } } @@ -76,4 +76,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs index 916c44242..e9029e276 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs @@ -11,13 +11,13 @@ namespace Server.Mobiles { private bool m_Stunning; + public override string DefaultName => "a betrayer"; + [Constructible] public Betrayer() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a betrayer"; Body = 767; - SetStr( 401, 500 ); SetDex( 81, 100 ); SetInt( 151, 200 ); @@ -96,9 +96,9 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 1 ); } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool AlwaysMurderer => true; + public override bool BardImmune => !Core.AOS; + public override Poison PoisonImmune => Poison.Lethal; public override int Meat{ get{ return 1; } } public override int TreasureMapLevel{ get{ return 5; } } @@ -185,4 +185,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Bogle.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Bogle.cs index 0d554ce1a..4dd2a2070 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Bogle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Bogle.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a ghostly corpse" )] public class Bogle : BaseCreature { + public override string DefaultName => "a bogle"; + [Constructible] public Bogle() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a bogle"; Body = 153; BaseSoundID = 0x482; @@ -41,8 +42,8 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public Bogle( Serial serial ) : base( serial ) { @@ -65,4 +66,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs index 70d448a4e..383df87bb 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs @@ -5,12 +5,14 @@ using Server.Items; namespace Server.Mobiles { [CorpseName( "a skeletal corpse" )] + [TypeAlias("Server.Mobiles.BoneMage")] public class BoneMagi : BaseCreature { + public override string DefaultName => "a bone mage"; + [Constructible] public BoneMagi() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a bone mage"; Body = 148; BaseSoundID = 451; @@ -54,15 +56,15 @@ namespace Server.Mobiles AddLoot( LootPack.LowScrolls ); AddLoot( LootPack.Potions ); } - - public override bool BleedImmune{ get{ return true; } } - + + public override bool BleedImmune => true; + public override OppositionGroup OppositionGroup { get{ return OppositionGroup.FeyAndUndead; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; public BoneMagi( Serial serial ) : base( serial ) { @@ -80,4 +82,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs index 98011e83e..74f0b02c1 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs @@ -57,11 +57,11 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override bool CanRummageCorpses{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override bool CanRummageCorpses => true; + public override Poison PoisonImmune => Poison.Regular; public override int TreasureMapLevel{ get{ return 4; } } public override int Meat{ get{ return 1; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public Daemon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs index 4584bafeb..807dfd550 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "an elder gazer corpse" )] public class ElderGazer : BaseCreature { + public override string DefaultName => "an elder gazer"; + [Constructible] public ElderGazer () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an elder gazer"; Body = 22; BaseSoundID = 377; @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs index a6708699d..ba151b9bf 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs @@ -3,14 +3,14 @@ using Server; using Server.Misc; using Server.Items; -namespace Server.Mobiles -{ - [CorpseName( "an evil mage corpse" )] - public class EvilMage : BaseCreature - { - [Constructible] - public EvilMage() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) - { +namespace Server.Mobiles +{ + [CorpseName( "an evil mage corpse" )] + public class EvilMage : BaseCreature + { + [Constructible] + public EvilMage() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) + { Name = NameList.RandomName( "evil mage" ); Title = "the evil mage"; Body = 124; @@ -51,8 +51,8 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls ); } - public override bool CanRummageCorpses{ get{ return true; } } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool CanRummageCorpses => true; + public override bool AlwaysMurderer => true; public override int Meat{ get{ return 1; } } public override int TreasureMapLevel{ get{ return Core.AOS ? 1 : 0; } } @@ -72,4 +72,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs index 1fdea9bd8..8cff8460f 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs @@ -1,20 +1,20 @@ -using System; +using System; using Server; using Server.Items; -namespace Server.Mobiles -{ - [CorpseName( "an evil mage lord corpse" )] - public class EvilMageLord : BaseCreature - { - [Constructible] - public EvilMageLord() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) - { +namespace Server.Mobiles +{ + [CorpseName( "an evil mage lord corpse" )] + public class EvilMageLord : BaseCreature + { + [Constructible] + public EvilMageLord() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) + { Name = NameList.RandomName( "evil mage lord" ); Body = Utility.RandomList( 125, 126 ); - PackItem( new Robe( Utility.RandomMetalHue() ) ); - PackItem( new WizardsHat( Utility.RandomMetalHue() ) ); + PackItem( new Robe( Utility.RandomMetalHue() ) ); + PackItem( new WizardsHat( Utility.RandomMetalHue() ) ); SetStr( 81, 105 ); SetDex( 191, 215 ); @@ -57,25 +57,25 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override bool CanRummageCorpses{ get{ return true; } } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool CanRummageCorpses => true; + public override bool AlwaysMurderer => true; public override int Meat{ get{ return 1; } } public override int TreasureMapLevel{ get{ return Core.AOS ? 2 : 0; } } - public EvilMageLord( Serial serial ) : base( serial ) - { - } + public EvilMageLord( Serial serial ) : base( serial ) + { + } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); - writer.Write( (int) 0 ); - } + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); + writer.Write( (int) 0 ); + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); + int version = reader.ReadInt(); + } + } +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs index e55d2c550..553083c2a 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs @@ -50,10 +50,10 @@ namespace Server.Mobiles AddLoot( LootPack.Gems ); } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool HasBreath => true; // fire breath enabled public override int TreasureMapLevel{ get{ return 1; } } public override int Meat{ get{ return 1; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public FireGargoyle( Serial serial ) : base( serial ) { @@ -71,4 +71,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs index e2a9b7c9b..9fba3486e 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a gargoyle corpse" )] public class Gargoyle : BaseCreature { + public override string DefaultName => "a gargoyle"; + [Constructible] public Gargoyle() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a gargoyle"; Body = 4; BaseSoundID = 372; @@ -44,7 +45,7 @@ namespace Server.Mobiles PackItem( new GargoylesPickaxe() ); } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public override void GenerateLoot() { @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs index d55b4cb71..cf28fa8ab 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a gargoyle corpse" )] public class GargoyleDestroyer : BaseCreature { + public override string DefaultName => "a gargoyle destroyer"; + [Constructible] public GargoyleDestroyer() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "Gargoyle Destroyer"; Body = 0x2F3; BaseSoundID = 0x174; @@ -55,9 +56,9 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool BardImmune{ get{ return !Core.AOS; } } + public override bool BardImmune => !Core.AOS; public override int Meat{ get{ return 1; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public override void OnDamagedBySpell( Mobile from ) { @@ -101,4 +102,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs index 85a110602..42b598d5c 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs @@ -6,15 +6,13 @@ namespace Server.Mobiles [CorpseName( "a gargoyle corpse" )] public class GargoyleEnforcer : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.WhirlwindAttack; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.WhirlwindAttack; + + public override string DefaultName => "a gargoyle enforcer"; [Constructible] public GargoyleEnforcer() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "Gargoyle Enforcer"; Body = 0x2F2; BaseSoundID = 0x174; @@ -50,7 +48,7 @@ namespace Server.Mobiles PackItem( new GargoylesPickaxe() ); } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public override void GenerateLoot() { @@ -76,4 +74,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gazer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gazer.cs index 4bc29559c..12e00246d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gazer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gazer.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a gazer corpse" )] public class Gazer : BaseCreature { + public override string DefaultName => "a gazer"; + [Constructible] public Gazer () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a gazer"; Body = 22; BaseSoundID = 377; @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/GolemController.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/GolemController.cs index c188f8891..d8d0120f0 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/GolemController.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/GolemController.cs @@ -1,15 +1,15 @@ -using System; +using System; using Server; using Server.Items; -namespace Server.Mobiles -{ - [CorpseName( "a golem controller corpse" )] - public class GolemController : BaseCreature - { - [Constructible] - public GolemController() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) - { +namespace Server.Mobiles +{ + [CorpseName( "a golem controller corpse" )] + public class GolemController : BaseCreature + { + [Constructible] + public GolemController() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) + { Name = NameList.RandomName( "golem controller" ); Title = "the controller"; @@ -72,24 +72,24 @@ namespace Server.Mobiles AddItem( item ); } - public override bool ClickTitle{ get{ return false; } } - public override bool ShowFameTitle{ get{ return false; } } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool ClickTitle => false; + public override bool ShowFameTitle => false; + public override bool AlwaysMurderer => true; - public GolemController( Serial serial ) : base( serial ) - { - } + public GolemController( Serial serial ) : base( serial ) + { + } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); - writer.Write( (int) 0 ); - } + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); + writer.Write( (int) 0 ); + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); + int version = reader.ReadInt(); + } + } +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs index 3c081a0c5..903a2e91b 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "an ice fiend corpse" )] public class IceFiend : BaseCreature { + public override string DefaultName => "an ice fiend"; + [Constructible] public IceFiend () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an ice fiend"; Body = 43; BaseSoundID = 357; @@ -49,7 +50,7 @@ namespace Server.Mobiles public override int TreasureMapLevel{ get{ return 4; } } public override int Meat{ get{ return 1; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public IceFiend( Serial serial ) : base( serial ) { @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs index 01e510a39..c236a97bc 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "an imp corpse" )] public class Imp : BaseCreature { + public override string DefaultName => "an imp"; + [Constructible] public Imp() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an imp"; Body = 74; BaseSoundID = 422; @@ -59,7 +60,7 @@ namespace Server.Mobiles public override HideType HideType{ get{ return HideType.Spined; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } public override PackInstinct PackInstinct{ get{ return PackInstinct.Daemon; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public Imp( Serial serial ) : base( serial ) { @@ -77,4 +78,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Lich.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Lich.cs index c3ba90f63..b67918907 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Lich.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Lich.cs @@ -4,13 +4,14 @@ using Server.Items; namespace Server.Mobiles { - [CorpseName( "a liche's corpse" )] + [CorpseName( "a lich's corpse" )] public class Lich : BaseCreature { + public override string DefaultName => "a lich"; + [Constructible] public Lich() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a lich"; Body = 24; BaseSoundID = 0x3E9; @@ -61,9 +62,9 @@ namespace Server.Mobiles get{ return OppositionGroup.FeyAndUndead; } } - public override bool CanRummageCorpses{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool CanRummageCorpses => true; + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 3; } } public Lich( Serial serial ) : base( serial ) @@ -82,4 +83,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/LichLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/LichLord.cs index db5a470e8..62c90ec67 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/LichLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/LichLord.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a lich's corpse" )] public class LichLord : BaseCreature { + public override string DefaultName => "a lich lord"; + [Constructible] public LichLord() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a lich lord"; Body = 79; BaseSoundID = 412; @@ -60,9 +61,9 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override bool CanRummageCorpses{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool CanRummageCorpses => true; + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return 4; } } public LichLord( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs index c2c34bee9..88c840c80 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs @@ -10,10 +10,11 @@ namespace Server.Mobiles { public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Orc; } } + public override string DefaultName => "an orcish mage"; + [Constructible] public OrcishMage () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an orcish mage"; Body = 140; BaseSoundID = 0x45A; @@ -57,7 +58,7 @@ namespace Server.Mobiles AddLoot( LootPack.LowScrolls ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 1; } } public override int Meat{ get{ return 1; } } diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs index a18da97b9..751fa4f6d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs @@ -57,7 +57,7 @@ namespace Server.Mobiles AddLoot( LootPack.LowScrolls ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int Meat{ get{ return 1; } } public override int Hides{ get{ return 8; } } public override HideType HideType{ get{ return HideType.Spined; } } diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs index 54ed3f1f9..50ffd3a4f 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs @@ -65,8 +65,8 @@ namespace Server.Mobiles } public override int Meat{ get{ return 1; } } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool ShowFameTitle{ get{ return false; } } + public override bool AlwaysMurderer => true; + public override bool ShowFameTitle => false; public override OppositionGroup OppositionGroup { @@ -287,4 +287,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Shade.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Shade.cs index 4a2eafee8..e026c4658 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Shade.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Shade.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a ghostly corpse" )] public class Shade : BaseCreature { + public override string DefaultName => "a shade"; + [Constructible] public Shade() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a shade"; Body = 26; Hue = 0x4001; BaseSoundID = 0x482; @@ -49,14 +50,14 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override OppositionGroup OppositionGroup { get{ return OppositionGroup.FeyAndUndead; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public Shade( Serial serial ) : base( serial ) { @@ -74,4 +75,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/SkeletalMage.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/SkeletalMage.cs index 7fdba5812..5ac56403e 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/SkeletalMage.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/SkeletalMage.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a skeletal corpse" )] public class SkeletalMage : BaseCreature { + public override string DefaultName => "a skeletal mage"; + [Constructible] public SkeletalMage() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a skeletal mage"; Body = 148; BaseSoundID = 451; @@ -53,15 +54,15 @@ namespace Server.Mobiles AddLoot( LootPack.LowScrolls ); AddLoot( LootPack.Potions ); } - - public override bool BleedImmune{ get{ return true; } } + + public override bool BleedImmune => true; public override OppositionGroup OppositionGroup { get{ return OppositionGroup.FeyAndUndead; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; public SkeletalMage( Serial serial ) : base( serial ) { @@ -79,4 +80,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Spectre.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Spectre.cs index c379bb0b8..1c0b5d2e2 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Spectre.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Spectre.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a ghostly corpse" )] public class Spectre : BaseCreature { + public override string DefaultName => "a spectre"; + [Constructible] public Spectre() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a spectre"; Body = 26; Hue = 0x4001; BaseSoundID = 0x482; @@ -48,15 +49,15 @@ namespace Server.Mobiles { AddLoot( LootPack.Meager ); } - - public override bool BleedImmune{ get{ return true; } } + + public override bool BleedImmune => true; public override OppositionGroup OppositionGroup { get{ return OppositionGroup.FeyAndUndead; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public Spectre( Serial serial ) : base( serial ) { @@ -74,4 +75,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs index 32a0b0a5e..e96cfa43f 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a succubus corpse" )] public class Succubus : BaseCreature { + public override string DefaultName => "a succubus"; + [Constructible] public Succubus () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a succubus"; Body = 149; BaseSoundID = 0x4B0; @@ -117,4 +118,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Titan.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Titan.cs index 1f23e9efb..8b4168b6f 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Titan.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Titan.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a titans corpse" )] public class Titan : BaseCreature { + public override string DefaultName => "a titan"; + [Constructible] public Titan() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a titan"; Body = 76; BaseSoundID = 609; @@ -53,7 +54,7 @@ namespace Server.Mobiles } public override int Meat{ get{ return 4; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; public override int TreasureMapLevel{ get{ return 5; } } public Titan( Serial serial ) : base( serial ) @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Wraith.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Wraith.cs index 50b948c17..fecea1848 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Wraith.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Wraith.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a ghostly corpse" )] public class Wraith : BaseCreature { + public override string DefaultName => "a wraith"; + [Constructible] public Wraith() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a wraith"; Body = 26; Hue = 0x4001; BaseSoundID = 0x482; @@ -48,15 +49,15 @@ namespace Server.Mobiles { AddLoot( LootPack.Meager ); } - - public override bool BleedImmune{ get{ return true; } } + + public override bool BleedImmune => true; public override OppositionGroup OppositionGroup { get{ return OppositionGroup.FeyAndUndead; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public Wraith( Serial serial ) : base( serial ) { @@ -74,4 +75,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs index 786721588..db4dc62f9 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs @@ -9,10 +9,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.ArticOgreLord" )] public class ArcticOgreLord : BaseCreature { + public override string DefaultName => "an arctic ogre lord"; + [Constructible] public ArcticOgreLord() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an arctic ogre lord"; Body = 135; BaseSoundID = 427; @@ -50,7 +51,7 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; public override int TreasureMapLevel{ get{ return 3; } } public ArcticOgreLord( Serial serial ) : base( serial ) @@ -69,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/BoneKnight.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/BoneKnight.cs index ef494600c..e206235d5 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/BoneKnight.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/BoneKnight.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a skeletal corpse" )] public class BoneKnight : BaseCreature { + public override string DefaultName => "a bone knight"; + [Constructible] public BoneKnight() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a bone knight"; Body = 57; BaseSoundID = 451; @@ -62,7 +63,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public BoneKnight( Serial serial ) : base( serial ) { @@ -85,4 +86,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Brigand.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Brigand.cs index b41363e63..d8a9ef780 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Brigand.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Brigand.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { public class Brigand : BaseCreature { - public override bool ClickTitle{ get{ return false; } } + public override bool ClickTitle => false; [Constructible] public Brigand() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -78,7 +78,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public Brigand( Serial serial ) : base( serial ) { @@ -98,4 +98,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/ChaosDaemon.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/ChaosDaemon.cs index 4e47b95b2..f26645974 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/ChaosDaemon.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/ChaosDaemon.cs @@ -8,15 +8,13 @@ namespace Server.Mobiles [CorpseName( "a chaos daemon corpse" )] public class ChaosDaemon : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.CrushingBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow; + + public override string DefaultName => "a chaos daemon"; [Constructible] public ChaosDaemon() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a chaos daemon"; Body = 792; BaseSoundID = 0x3E9; @@ -69,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Cursed.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Cursed.cs index 5709a6b18..ead29e689 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Cursed.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Cursed.cs @@ -6,8 +6,8 @@ namespace Server.Mobiles [CorpseName( "an inhuman corpse" )] public class Cursed : BaseCreature { - public override bool ClickTitle{ get{ return false; } } - public override bool ShowFameTitle{ get{ return false; } } + public override bool ClickTitle => false; + public override bool ShowFameTitle => false; [Constructible] public Cursed() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -62,7 +62,7 @@ namespace Server.Mobiles //AddLoot( LootPack.Miscellaneous ); } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public Cursed( Serial serial ) : base( serial ) { @@ -82,4 +82,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs index c380e9669..30d8b6b28 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a cyclopean corpse" )] public class Cyclops : BaseCreature { + public override string DefaultName => "a cyclopean warrior"; + [Constructible] public Cyclops() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a cyclopean warrior"; Body = 75; BaseSoundID = 604; @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs index 4059c6791..da1df8afb 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a doppleganger corpse" )] public class Doppleganger : BaseCreature { + public override string DefaultName => "a doppleganger"; + [Constructible] public Doppleganger() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a doppleganger"; Body = 0x309; BaseSoundID = 0x451; @@ -61,4 +62,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs index f8d76cb2d..edf04d0b8 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles // TODO: Needs some Spellweaving abilities public class ElfBrigand : BaseCreature { - public override bool ClickTitle{ get{ return false; } } + public override bool ClickTitle => false; [Constructible] public ElfBrigand() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -91,7 +91,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public ElfBrigand( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs index 35ec516f8..ab6c3396d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "an enslaved gargoyle corpse" )] public class EnslavedGargoyle : BaseCreature { + public override string DefaultName => "an enslaved gargoyle"; + [Constructible] public EnslavedGargoyle() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an enslaved gargoyle"; Body = 0x2F1; BaseSoundID = 0x174; @@ -65,4 +66,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ettin.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ettin.cs index cf9999360..939d202c3 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ettin.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ettin.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "an ettins corpse" )] public class Ettin : BaseCreature { + public override string DefaultName => "an ettin"; + [Constructible] public Ettin() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an ettin"; Body = 18; BaseSoundID = 367; @@ -48,7 +49,7 @@ namespace Server.Mobiles AddLoot( LootPack.Potions ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 1; } } public override int Meat{ get{ return 4; } } @@ -68,4 +69,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Executioner.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Executioner.cs index bf81cd553..f61148e46 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Executioner.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Executioner.cs @@ -1,33 +1,33 @@ -using System; -using System.Collections; -using Server.Items; -using Server.ContextMenus; -using Server.Misc; -using Server.Network; +using System; +using System.Collections; +using Server.Items; +using Server.ContextMenus; +using Server.Misc; +using Server.Network; -namespace Server.Mobiles -{ - public class Executioner : BaseCreature - { - [Constructible] - public Executioner() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) - { - SpeechHue = Utility.RandomDyedHue(); - Title = "the executioner"; - Hue = Utility.RandomSkinHue(); +namespace Server.Mobiles +{ + public class Executioner : BaseCreature + { + [Constructible] + public Executioner() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) + { + SpeechHue = Utility.RandomDyedHue(); + Title = "the executioner"; + Hue = Utility.RandomSkinHue(); - if ( this.Female = Utility.RandomBool() ) - { - this.Body = 0x191; - this.Name = NameList.RandomName( "female" ); - AddItem( new Skirt( Utility.RandomRedHue() ) ); - } - else - { - this.Body = 0x190; - this.Name = NameList.RandomName( "male" ); - AddItem( new ShortPants( Utility.RandomRedHue() ) ); - } + if ( this.Female = Utility.RandomBool() ) + { + this.Body = 0x191; + this.Name = NameList.RandomName( "female" ); + AddItem( new Skirt( Utility.RandomRedHue() ) ); + } + else + { + this.Body = 0x190; + this.Name = NameList.RandomName( "male" ); + AddItem( new ShortPants( Utility.RandomRedHue() ) ); + } SetStr( 386, 400 ); SetDex( 151, 165 ); @@ -57,8 +57,8 @@ namespace Server.Mobiles VirtualArmor = 40; - AddItem( new ThighBoots( Utility.RandomRedHue() ) ); - AddItem( new Surcoat( Utility.RandomRedHue() ) ); + AddItem( new ThighBoots( Utility.RandomRedHue() ) ); + AddItem( new Surcoat( Utility.RandomRedHue() ) ); AddItem( new ExecutionersAxe()); Utility.AssignRandomHair( this ); @@ -70,24 +70,24 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; - public Executioner( Serial serial ) : base( serial ) - { - } + public Executioner( Serial serial ) : base( serial ) + { + } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); - writer.Write( (int) 0 ); // version - } + writer.Write( (int) 0 ); // version + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file + int version = reader.ReadInt(); + } + } +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs index 66718fa2d..6039e8234 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a frost troll corpse" )] public class FrostTroll : BaseCreature { + public override string DefaultName => "a frost troll"; + [Constructible] public FrostTroll() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a frost troll"; Body = 55; BaseSoundID = 461; @@ -68,4 +69,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs index aa71be205..2125f844c 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a gazer larva corpse" )] public class GazerLarva : BaseCreature { + public override string DefaultName => "a gazer larva"; + [Constructible] public GazerLarva () : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a gazer larva"; Body = 778; BaseSoundID = 377; @@ -61,4 +62,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ghoul.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ghoul.cs index 7c9a63e67..1ef94162a 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ghoul.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ghoul.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a ghostly corpse" )] public class Ghoul : BaseCreature { + public override string DefaultName => "a ghoul"; + [Constructible] public Ghoul() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a ghoul"; Body = 153; BaseSoundID = 0x482; @@ -48,8 +49,8 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Regular; public Ghoul( Serial serial ) : base( serial ) { @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs index 9306c41fc..833eae583 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a mongbat corpse" )] public class GreaterMongbat : BaseCreature { + public override string DefaultName => "a greater mongbat"; + [Constructible] public GreaterMongbat() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a greater mongbat"; Body = 39; BaseSoundID = 422; diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs index 39868cb1d..3681e073d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a headless corpse" )] public class HeadlessOne : BaseCreature { + public override string DefaultName => "a headless one"; + [Constructible] public HeadlessOne() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a headless one"; Body = 31; Hue = Utility.RandomSkinHue() & 0x7FFF; BaseSoundID = 0x39D; @@ -44,7 +45,7 @@ namespace Server.Mobiles // TODO: body parts } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int Meat{ get{ return 1; } } public HeadlessOne( Serial serial ) : base( serial ) @@ -63,4 +64,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/HordeMinion.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/HordeMinion.cs index 67d6d7dbd..af21a1aad 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/HordeMinion.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/HordeMinion.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a horde minion corpse" )] public class HordeMinion : BaseCreature { + public override string DefaultName => "a horde minion"; + [Constructible] public HordeMinion () : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a horde minion"; Body = 776; BaseSoundID = 357; @@ -84,4 +85,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs index 1ee60fb99..18cd1ed92 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs @@ -11,10 +11,11 @@ namespace Server.Mobiles { private bool m_Stunning; + public override string DefaultName => "a blackthorn juggernaut"; + [Constructible] public Juggernaut() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.3, 0.6 ) { - Name = "a blackthorn juggernaut"; Body = 768; @@ -92,10 +93,10 @@ namespace Server.Mobiles return 0x140; } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool AlwaysMurderer => true; + public override bool BardImmune => !Core.AOS; + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public override int Meat{ get{ return 1; } } public override int TreasureMapLevel{ get{ return 5; } } @@ -155,4 +156,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs index 9a2970a5a..777bb4f95 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs @@ -14,7 +14,7 @@ namespace Server.Mobiles { EventSink.PlayerDeath += new PlayerDeathEventHandler( EventSink_PlayerDeath ); } - + public static void EventSink_PlayerDeath( PlayerDeathEventArgs e ) { Mobile m = e.Mobile; @@ -56,18 +56,19 @@ namespace Server.Mobiles private Mobile m_Target; private DateTime m_ExpireTime; - public override bool DeleteCorpseOnDeath{ get{ return true; } } + public override bool DeleteCorpseOnDeath => true; public override void DisplayPaperdollTo( Mobile to ) { } public override Mobile ConstantFocus{ get{ return m_Target; } } - public override bool AlwaysAttackable{ get{ return true; } } + public override bool AlwaysAttackable => true; + + public override string DefaultName => "a revenant"; public KhaldunRevenant( Mobile target ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.18, 0.36 ) { - Name = "a revenant"; Body = 0x3CA; Hue = 0x41CE; @@ -124,8 +125,8 @@ namespace Server.Mobiles return 0xFD; } - public override bool BardImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BardImmune => true; + public override Poison PoisonImmune => Poison.Lethal; public override void OnThink() { @@ -178,4 +179,4 @@ namespace Server.Mobiles Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs index 91c18a416..3f5fbf6db 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs @@ -9,14 +9,15 @@ namespace Server.Mobiles { public class KhaldunSummoner : BaseCreature { - public override bool ClickTitle{ get{ return false; } } - public override bool ShowFameTitle{ get{ return false; } } + public override bool ClickTitle => false; + public override bool ShowFameTitle => false; + + public override string DefaultName => "Zealot of Khaldun"; [Constructible] public KhaldunSummoner():base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Body = 0x190; - Name = "Zealot of Khaldun"; Title = "the Summoner"; SetStr( 351, 400 ); @@ -92,8 +93,8 @@ namespace Server.Mobiles return 0x19F; } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool Unprovokable{ get{ return true; } } + public override bool AlwaysMurderer => true; + public override bool Unprovokable => true; public KhaldunSummoner( Serial serial ) : base( serial ) { @@ -141,4 +142,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs index 5393b94bc..3c36c8312 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs @@ -9,14 +9,15 @@ namespace Server.Mobiles { public class KhaldunZealot : BaseCreature { - public override bool ClickTitle{ get{ return false; } } - public override bool ShowFameTitle{ get{ return false; } } + public override bool ClickTitle => false; + public override bool ShowFameTitle => false; + + public override string DefaultName => "Zealot of Khaldun"; [Constructible] public KhaldunZealot(): base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Body = 0x190; - Name = "Zealot of Khaldun"; Title = "the Knight"; Hue = 0; @@ -100,9 +101,9 @@ namespace Server.Mobiles return 0x19F; } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool Unprovokable{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } + public override bool AlwaysMurderer => true; + public override bool Unprovokable => true; + public override Poison PoisonImmune => Poison.Deadly; public KhaldunZealot( Serial serial ) : base( serial ) { @@ -150,4 +151,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Moloch.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Moloch.cs index 3c6e49e39..eb563d53f 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Moloch.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Moloch.cs @@ -6,15 +6,13 @@ namespace Server.Mobiles [CorpseName( "a moloch corpse" )] public class Moloch : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ConcussionBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.ConcussionBlow; + + public override string DefaultName => "a moloch"; [Constructible] public Moloch() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a moloch"; Body = 0x311; BaseSoundID = 0x300; @@ -47,7 +45,7 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; public Moloch( Serial serial ) : base( serial ) { @@ -65,4 +63,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs index 737d15f8b..8a018f5b6 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a mongbat corpse" )] public class Mongbat : BaseCreature { + public override string DefaultName => "a mongbat"; + [Constructible] public Mongbat() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a mongbat"; Body = 39; BaseSoundID = 422; @@ -42,7 +43,7 @@ namespace Server.Mobiles MinTameSkill = -18.9; } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public override void GenerateLoot() { @@ -68,4 +69,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Mummy.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Mummy.cs index 706f86e30..7fd8ac9b4 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Mummy.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Mummy.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a mummy corpse" )] public class Mummy : BaseCreature { + public override string DefaultName => "a mummy"; + [Constructible] public Mummy() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.4, 0.8 ) { - Name = "a mummy"; Body = 154; BaseSoundID = 471; @@ -55,8 +56,8 @@ namespace Server.Mobiles AddLoot( LootPack.Potions ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lesser; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lesser; public Mummy( Serial serial ) : base( serial ) { @@ -79,4 +80,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ogre.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ogre.cs index 767695317..fbf76ae5d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ogre.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ogre.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "an ogre corpse" )] public class Ogre : BaseCreature { + public override string DefaultName => "an ogre"; + [Constructible] public Ogre () : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an ogre"; Body = 1; BaseSoundID = 427; @@ -50,7 +51,7 @@ namespace Server.Mobiles AddLoot( LootPack.Potions ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 1; } } public override int Meat{ get{ return 2; } } @@ -70,4 +71,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs index fdb8a60ff..41c6567a9 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs @@ -12,10 +12,11 @@ namespace Server.Mobiles public override Faction FactionAllegiance { get { return Minax.Instance; } } public override Ethics.Ethic EthicAllegiance { get { return Ethics.Ethic.Evil; } } + public override string DefaultName => "an ogre lord"; + [Constructible] public OgreLord () : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an ogre lord"; Body = 83; BaseSoundID = 427; @@ -52,8 +53,8 @@ namespace Server.Mobiles AddLoot( LootPack.Rich, 2 ); } - public override bool CanRummageCorpses{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override bool CanRummageCorpses => true; + public override Poison PoisonImmune => Poison.Regular; public override int TreasureMapLevel{ get{ return 3; } } public override int Meat{ get{ return 2; } } @@ -73,4 +74,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Orc.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Orc.cs index 8b7bc6eb9..d515a164e 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Orc.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Orc.cs @@ -71,7 +71,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 1; } } public override int Meat{ get{ return 1; } } diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs index 5bca52817..7575a2664 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs @@ -11,12 +11,12 @@ namespace Server.Mobiles { public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Orc; } } + public override string DefaultName => "an orc bomber"; + [Constructible] public OrcBomber() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Body = 182; - - Name = "an orc bomber"; BaseSoundID = 0x45A; SetStr( 147, 215 ); @@ -62,7 +62,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs index 96f00fe11..19ca8b376 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs @@ -9,12 +9,12 @@ namespace Server.Mobiles [CorpseName( "an orcish corpse" )] public class OrcBrute : BaseCreature { + public override string DefaultName => "an orc brute"; + [Constructible] public OrcBrute() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Body = 189; - - Name = "an orc brute"; BaseSoundID = 0x45A; SetStr( 767, 945 ); @@ -61,8 +61,8 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BardImmune => !Core.AOS; + public override Poison PoisonImmune => Poison.Lethal; public override int Meat{ get{ return 2; } } public override OppositionGroup OppositionGroup @@ -93,8 +93,8 @@ namespace Server.Mobiles } } - public override bool CanRummageCorpses{ get{ return true; } } - public override bool AutoDispel{ get{ return true; } } + public override bool CanRummageCorpses => true; + public override bool AutoDispel => true; public override void OnDamagedBySpell( Mobile caster ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs index 854db2301..2221da846 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs @@ -73,7 +73,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager, 2 ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int Meat{ get{ return 1; } } public override OppositionGroup OppositionGroup @@ -120,4 +120,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs index 0a051e3eb..51fdc16ab 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs @@ -11,10 +11,11 @@ namespace Server.Mobiles { public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Orc; } } + public override string DefaultName => "an orcish lord"; + [Constructible] public OrcishLord() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an orcish lord"; Body = 138; BaseSoundID = 0x45A; @@ -67,7 +68,7 @@ namespace Server.Mobiles // TODO: evil orc helm } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 1; } } public override int Meat{ get{ return 1; } } @@ -115,4 +116,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ratman.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ratman.cs index f63d5c1da..2bfa9d83f 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ratman.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ratman.cs @@ -50,7 +50,7 @@ namespace Server.Mobiles // TODO: weapon, misc } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int Hides{ get{ return 8; } } public override HideType HideType{ get{ return HideType.Spined; } } @@ -70,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs index 2d389f094..7180574ff 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs @@ -54,7 +54,7 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int Hides{ get{ return 8; } } public override HideType HideType{ get{ return HideType.Spined; } } diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs index 81708fb11..ca654c555 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs @@ -12,10 +12,11 @@ namespace Server.Mobiles [CorpseName( "a ghostly corpse" )] public class RestlessSoul : BaseCreature { + public override string DefaultName => "a restless soul"; + [Constructible] public RestlessSoul() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.4, 0.8 ) { - Name = "restless soul"; Body = 0x3CA; Hue = 0x453; @@ -51,8 +52,8 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override bool AlwaysAttackable{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } + public override bool AlwaysAttackable => true; + public override bool BleedImmune => true; public override void DisplayPaperdollTo(Mobile to) { @@ -117,4 +118,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs index 5d08dcc46..719358747 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a rotting corpse" )] public class RottingCorpse : BaseCreature { + public override string DefaultName => "a rotting corpse"; + [Constructible] public RottingCorpse() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a rotting corpse"; Body = 155; BaseSoundID = 471; @@ -51,9 +52,9 @@ namespace Server.Mobiles AddLoot( LootPack.FilthyRich, 2 ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override Poison HitPoison{ get{ return Poison.Lethal; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; + public override Poison HitPoison => Poison.Lethal; public override int TreasureMapLevel{ get{ return 5; } } public RottingCorpse( Serial serial ) : base( serial ) @@ -77,4 +78,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Savage.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Savage.cs index 4504b7eb4..91ef90179 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Savage.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Savage.cs @@ -59,8 +59,8 @@ namespace Server.Mobiles } public override int Meat{ get{ return 1; } } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool ShowFameTitle{ get{ return false; } } + public override bool AlwaysMurderer => true; + public override bool ShowFameTitle => false; public override OppositionGroup OppositionGroup { @@ -115,4 +115,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs index 1890bea60..b2389c2a1 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs @@ -56,8 +56,8 @@ namespace Server.Mobiles } public override int Meat{ get{ return 1; } } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool ShowFameTitle{ get{ return false; } } + public override bool AlwaysMurderer => true; + public override bool ShowFameTitle => false; public override OppositionGroup OppositionGroup { @@ -125,4 +125,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/ShadowFiend.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/ShadowFiend.cs index 6cf563ae0..cfb09813b 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/ShadowFiend.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/ShadowFiend.cs @@ -6,14 +6,15 @@ namespace Server.Mobiles { public class ShadowFiend : BaseCreature { - public override bool DeleteCorpseOnDeath{ get{ return true; } } + public override bool DeleteCorpseOnDeath => true; private UnhideTimer m_Timer; + public override string DefaultName => "a shadow fiend"; + [Constructible] public ShadowFiend() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a shadow fiend"; Body = 0xA8; // this to allow shadow fiend to loot from corpses @@ -75,7 +76,7 @@ namespace Server.Mobiles return 0x380; } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override bool OnBeforeDeath() { @@ -141,4 +142,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/SkeletalKnight.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/SkeletalKnight.cs index 03f151316..e62187ee6 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/SkeletalKnight.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/SkeletalKnight.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a skeletal corpse" )] public class SkeletalKnight : BaseCreature { + public override string DefaultName => "a skeletal knight"; + [Constructible] public SkeletalKnight() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a skeletal knight"; Body = 147; BaseSoundID = 451; @@ -61,7 +62,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public SkeletalKnight( Serial serial ) : base( serial ) { @@ -84,4 +85,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Skeleton.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Skeleton.cs index 7aa5b6ba4..8d41eb425 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Skeleton.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Skeleton.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a skeletal corpse" )] public class Skeleton : BaseCreature { + public override string DefaultName => "a skeleton"; + [Constructible] public Skeleton() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a skeleton"; Body = Utility.RandomList( 50, 56 ); BaseSoundID = 0x48D; @@ -55,8 +56,8 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lesser; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lesser; public Skeleton( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/SpectralArmour.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/SpectralArmour.cs index caeae1793..ba0967b95 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/SpectralArmour.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/SpectralArmour.cs @@ -1,19 +1,20 @@ -using System; -using Server.Items; +using System; +using Server.Items; -namespace Server.Mobiles -{ - - public class SpectralArmour : BaseCreature - { - public override bool DeleteCorpseOnDeath{ get{ return true; } } +namespace Server.Mobiles +{ - [Constructible] - public SpectralArmour() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) - { - Body = 637; - Hue = 0x8026; - Name = "spectral armour"; + public class SpectralArmour : BaseCreature + { + public override bool DeleteCorpseOnDeath => true; + + public override string DefaultName => "a spectral armour"; + + [Constructible] + public SpectralArmour() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) + { + Body = 637; + Hue = 0x8026; Buckler buckler = new Buckler(); ChainCoif coif = new ChainCoif(); @@ -27,8 +28,8 @@ namespace Server.Mobiles AddItem( coif ); AddItem( gloves ); - SetStr( 101, 110 ); - SetDex( 101, 110 ); + SetStr( 101, 110 ); + SetDex( 101, 110 ); SetInt( 101, 110 ); SetHits( 178, 201 ); @@ -45,13 +46,13 @@ namespace Server.Mobiles SetResistance( ResistanceType.Poison, 20, 30 ); SetResistance( ResistanceType.Energy, 20, 30 ); - SetSkill( SkillName.Wrestling, 75.1, 100.0 ); - SetSkill( SkillName.Tactics, 90.1, 100.0 ); - SetSkill( SkillName.MagicResist, 90.1, 100 ); + SetSkill( SkillName.Wrestling, 75.1, 100.0 ); + SetSkill( SkillName.Tactics, 90.1, 100.0 ); + SetSkill( SkillName.MagicResist, 90.1, 100 ); - VirtualArmor = 40; - Fame = 7000; - Karma = -7000; + VirtualArmor = 40; + Fame = 7000; + Karma = -7000; } public override int GetIdleSound() @@ -76,22 +77,22 @@ namespace Server.Mobiles return true; } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; - public SpectralArmour( Serial serial ) : base( serial ) - { - } + public SpectralArmour( Serial serial ) : base( serial ) + { + } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); - writer.Write( (int) 0 ); - } + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); + writer.Write( (int) 0 ); + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); + int version = reader.ReadInt(); + } + } +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs index 84a0b9329..77e253842 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a gargoyle corpse" )] public class StoneGargoyle : BaseCreature { + public override string DefaultName => "a stone gargoyle"; + [Constructible] public StoneGargoyle() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a stone gargoyle"; Body = 67; BaseSoundID = 0x174; @@ -71,4 +72,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs index aae27e838..414aca9cf 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a mongbat corpse" )] public class StrongMongbat : BaseCreature { + public override string DefaultName => "a mongbat"; + [Constructible] public StrongMongbat() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a mongbat"; Body = 39; BaseSoundID = 422; @@ -67,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Troll.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Troll.cs index 41907a134..2c94822a5 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Troll.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Troll.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a troll corpse" )] public class Troll : BaseCreature { + public override string DefaultName => "a troll"; + [Constructible] public Troll () : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a troll"; Body = Utility.RandomList( 53, 54 ); BaseSoundID = 461; @@ -46,7 +47,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 1; } } public override int Meat{ get{ return 2; } } @@ -66,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Zombie.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Zombie.cs index d8811b60a..0ebe47b52 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Zombie.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Zombie.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a rotting corpse" )] public class Zombie : BaseCreature { + public override string DefaultName => "a zombie"; + [Constructible] public Zombie() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a zombie"; Body = 3; BaseSoundID = 471; @@ -58,8 +59,8 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Regular; public Zombie( Serial serial ) : base( serial ) { @@ -82,4 +83,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs b/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs index 3f43c3ebf..3201c9f48 100644 --- a/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs +++ b/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs @@ -12,13 +12,14 @@ namespace Server.Mobiles public bool FieldActive{ get{ return m_FieldActive; } } public bool CanUseField{ get{ return Hits >= HitsMax * 9 / 10; } } // TODO: an OSI bug prevents to verify this - public override bool IsScaredOfScaryThings{ get{ return false; } } - public override bool IsScaryToPets{ get{ return true; } } + public override bool IsScaredOfScaryThings => false; + public override bool IsScaryToPets => true; + + public override string DefaultName => "an exodus minion"; [Constructible] public ExodusMinion() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "exodus minion"; Body = 0x2F5; SetStr( 851, 950 ); @@ -63,9 +64,9 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override bool AutoDispel{ get{ return true; } } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool AutoDispel => true; + public override bool BardImmune => !Core.AOS; + public override Poison PoisonImmune => Poison.Lethal; public override int GetIdleSound() { @@ -188,8 +189,8 @@ namespace Server.Mobiles m_FieldActive = CanUseField; - if( this.Name == "Exodus Minion" ) - this.Name = "exodus minion"; + if ( this.Name == "Exodus Minion" ) + this.Name = null; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs b/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs index a1088cb0d..ff52b65a2 100644 --- a/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs +++ b/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs @@ -12,13 +12,14 @@ namespace Server.Mobiles public bool FieldActive{ get{ return m_FieldActive; } } public bool CanUseField{ get{ return Hits >= HitsMax * 9 / 10; } } // TODO: an OSI bug prevents to verify this - public override bool IsScaredOfScaryThings{ get{ return false; } } - public override bool IsScaryToPets{ get{ return true; } } + public override bool IsScaredOfScaryThings => false; + public override bool IsScaryToPets => true; + + public override string DefaultName => "an exodus overseer"; [Constructible] public ExodusOverseer() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "exodus overseer"; Body = 0x2F4; SetStr( 561, 650 ); @@ -59,9 +60,9 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override bool AutoDispel{ get{ return true; } } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool AutoDispel => true; + public override bool BardImmune => !Core.AOS; + public override Poison PoisonImmune => Poison.Lethal; public override int GetIdleSound() { @@ -157,7 +158,7 @@ namespace Server.Mobiles this.FixedParticles( 0, 10, 0, 0x2530, EffectLayer.Waist ); return move; - } + } public void SendEBolt( Mobile to ) { @@ -185,7 +186,7 @@ namespace Server.Mobiles m_FieldActive = CanUseField; if( this.Name == "Exodus Overseer" ) - this.Name = "exodus overseer"; + this.Name = null; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs index 70681aa2f..9f1493e13 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a chaos dragoon corpse" )] public class ChaosDragoon : BaseCreature { + public override string DefaultName => "a chaos dragoon"; + [Constructible] public ChaosDragoon() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.15, 0.4 ) { - Name = "a chaos dragoon"; Body = 0x190; Hue = Utility.RandomSkinHue(); @@ -139,15 +140,15 @@ namespace Server.Mobiles public override void GenerateLoot() { AddLoot( LootPack.Rich ); - //AddLoot( LootPack.Gems ); + //AddLoot( LootPack.Gems ); } - public override bool HasBreath{ get{ return true; } } - public override bool AutoDispel{ get{ return true; } } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override bool CanRummageCorpses{ get{ return true; } } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool ShowFameTitle{ get{ return false; } } + public override bool HasBreath => true; + public override bool AutoDispel => true; + public override bool BardImmune => !Core.AOS; + public override bool CanRummageCorpses => true; + public override bool AlwaysMurderer => true; + public override bool ShowFameTitle => false; public override bool OnBeforeDeath() { diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs index 9d19932b7..b06ad684d 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs @@ -8,11 +8,12 @@ namespace Server.Mobiles [CorpseName("a chaos dragoon elite corpse")] public class ChaosDragoonElite : BaseCreature { + public override string DefaultName => "a chaos dragoon elite"; + [Constructible] public ChaosDragoonElite() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.15, 0.4) { - Name = "a chaos dragoon elite"; Body = 0x190; Hue = Utility.RandomSkinHue(); @@ -158,12 +159,12 @@ namespace Server.Mobiles AddLoot(LootPack.Gems); } - public override bool HasBreath { get { return true; } } - public override bool AutoDispel { get { return true; } } + public override bool HasBreath => true; + public override bool AutoDispel => true; public override bool BardImmune { get { return !Core.AOS; } } - public override bool CanRummageCorpses { get { return true; } } - public override bool AlwaysMurderer { get { return true; } } - public override bool ShowFameTitle { get { return false; } } + public override bool CanRummageCorpses => true; + public override bool AlwaysMurderer => true; + public override bool ShowFameTitle => false; public override bool OnBeforeDeath() { diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs index 204727277..ba5734093 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs @@ -6,13 +6,14 @@ using Server.Misc; namespace Server.Mobiles { - [CorpseName( "a juka corpse" )] // Why is this 'juka' and warriors 'jukan' ? :-( + [CorpseName( "a jukan corpse" )] public class JukaLord : BaseCreature { + public override string DefaultName => "a juka lord"; + [Constructible] public JukaLord() : base( AIType.AI_Archer, FightMode.Closest, 10, 3, 0.2, 0.4 ) { - Name = "a juka lord"; Body = 766; SetStr( 401, 500 ); @@ -104,9 +105,9 @@ namespace Server.Mobiles return 0x28D; } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool AlwaysMurderer => true; + public override bool BardImmune => !Core.AOS; + public override bool CanRummageCorpses => true; public override int Meat{ get{ return 1; } } public JukaLord( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs index 7fe135b34..957108245 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs @@ -7,13 +7,14 @@ using Server.Spells; namespace Server.Mobiles { - [CorpseName( "a juka corpse" )] // Why is this 'juka' and warriors 'jukan' ? :-( + [CorpseName( "a jukan corpse" )] public class JukaMage : BaseCreature { + public override string DefaultName => "a juka mage"; + [Constructible] public JukaMage() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a juka mage"; Body = 765; SetStr( 201, 300 ); @@ -96,8 +97,8 @@ namespace Server.Mobiles return 0x28D; } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool AlwaysMurderer => true; + public override bool CanRummageCorpses => true; public override int Meat{ get{ return 1; } } private DateTime m_NextAbilityTime; diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs index 31934f052..a0c64b58f 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs @@ -9,10 +9,11 @@ namespace Server.Mobiles [CorpseName( "a jukan corpse" )] public class JukaWarrior : BaseCreature { + public override string DefaultName => "a juka warrior"; + [Constructible] public JukaWarrior() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a juka warrior"; Body = 764; SetStr( 251, 350 ); @@ -75,8 +76,8 @@ namespace Server.Mobiles return 0x28D; } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool AlwaysMurderer => true; + public override bool CanRummageCorpses => true; public override int Meat{ get{ return 1; } } public override void OnGaveMeleeAttack( Mobile defender ) diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs b/Scripts/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs index d38f056d2..525b51941 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs @@ -7,26 +7,27 @@ namespace Server.Mobiles [CorpseName( "a hare corpse" )] public class EnragedRabbit : BaseEnraged { + public override string DefaultName => "a rabbit"; + public EnragedRabbit( Mobile summoner ) : base( summoner ) { - Name = "a rabbit"; Body = 0xcd; } - public override int GetAttackSound() - { - return 0xC9; - } + public override int GetAttackSound() + { + return 0xC9; + } - public override int GetHurtSound() - { - return 0xCA; - } + public override int GetHurtSound() + { + return 0xCA; + } - public override int GetDeathSound() - { - return 0xCB; - } + public override int GetDeathSound() + { + return 0xCB; + } public EnragedRabbit( Serial serial ) : base( serial ) { @@ -48,26 +49,27 @@ namespace Server.Mobiles [CorpseName( "a deer corpse" )] public class EnragedHart : BaseEnraged { + public override string DefaultName => "a great hart"; + public EnragedHart( Mobile summoner ) : base( summoner ) { - Name = "a great hart"; Body = 0xea; } - public override int GetAttackSound() - { - return 0x82; - } + public override int GetAttackSound() + { + return 0x82; + } - public override int GetHurtSound() - { - return 0x83; - } + public override int GetHurtSound() + { + return 0x83; + } - public override int GetDeathSound() - { - return 0x84; - } + public override int GetDeathSound() + { + return 0x84; + } public EnragedHart( Serial serial ) : base( serial ) { @@ -89,25 +91,26 @@ namespace Server.Mobiles [CorpseName( "a deer corpse" )] public class EnragedHind : BaseEnraged { + public override string DefaultName => "a hind"; + public EnragedHind( Mobile summoner ) : base( summoner ) { - Name = "a hind"; Body = 0xed; } - public override int GetAttackSound() - { - return 0x82; - } + public override int GetAttackSound() + { + return 0x82; + } - public override int GetHurtSound() - { - return 0x83; - } + public override int GetHurtSound() + { + return 0x83; + } - public override int GetDeathSound() - { - return 0x84; - } + public override int GetDeathSound() + { + return 0x84; + } public EnragedHind( Serial serial ) : base( serial ) { @@ -129,9 +132,10 @@ namespace Server.Mobiles [CorpseName( "a bear corpse" )] public class EnragedBlackBear : BaseEnraged { + public override string DefaultName => "a black bear"; + public EnragedBlackBear( Mobile summoner ) : base( summoner ) { - Name = "a black bear"; Body = 0xd3; BaseSoundID = 0xa3; } @@ -155,9 +159,10 @@ namespace Server.Mobiles [CorpseName( "an eagle corpse" )] public class EnragedEagle : BaseEnraged { + public override string DefaultName => "an eagle"; + public EnragedEagle( Mobile summoner ) : base( summoner ) { - Name = "an eagle"; Body = 0x5; BaseSoundID = 0x2ee; } @@ -178,7 +183,7 @@ namespace Server.Mobiles public class BaseEnraged : BaseCreature { - public BaseEnraged( Mobile summoner ) + public BaseEnraged( Mobile summoner ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { SetStr( 50, 200 ); @@ -186,7 +191,7 @@ namespace Server.Mobiles SetHits( 50, 200 ); SetStam( 50, 200 ); - /* + /* On OSI, all stats are random 50-200, but str is never less than hits, and dex is never less than stam. @@ -254,7 +259,7 @@ namespace Server.Mobiles { Mobile combatant = mobile.Combatant; if( combatant == null || combatant.Deleted ) - { + { return false; } else if ( combatant.IsDeadBondedPet || !combatant.Alive ) diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs index 898b2220c..332813cc7 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs @@ -10,10 +10,11 @@ namespace Server.Mobiles [CorpseName( "a meer corpse" )] public class MeerCaptain : BaseCreature { + public override string DefaultName => "a meer captain"; + [Constructible] public MeerCaptain() : base( AIType.AI_Archer, FightMode.Evil, 10, 1, 0.2, 0.4 ) { - Name = "a meer captain"; Body = 773; SetStr( 96, 110 ); @@ -86,10 +87,10 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool BardImmune => !Core.AOS; + public override bool CanRummageCorpses => true; - public override bool InitialInnocent{ get{ return true; } } + public override bool InitialInnocent => true; public override int GetHurtSound() { @@ -165,4 +166,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs index 297090203..f7b3bfc75 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs @@ -10,10 +10,11 @@ namespace Server.Mobiles [CorpseName( "a meer's corpse" )] public class MeerEternal : BaseCreature { + public override string DefaultName => "a meer eternal"; + [Constructible] public MeerEternal() : base( AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4 ) { - Name = "a meer eternal"; Body = 772; SetStr( 416, 505 ); @@ -54,13 +55,13 @@ namespace Server.Mobiles AddLoot( LootPack.HighScrolls, 2 ); } - public override bool AutoDispel{ get{ return true; } } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override bool CanRummageCorpses{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool AutoDispel => true; + public override bool BardImmune => !Core.AOS; + public override bool CanRummageCorpses => true; + public override Poison PoisonImmune => Poison.Lethal; public override int TreasureMapLevel{ get{ return Core.AOS ? 5 : 4; } } - public override bool InitialInnocent{ get{ return true; } } + public override bool InitialInnocent => true; public override int GetHurtSound() { @@ -214,4 +215,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs index 9dc2b3d05..893d4292b 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs @@ -10,10 +10,11 @@ namespace Server.Mobiles [CorpseName( "a meer's corpse" )] public class MeerMage : BaseCreature { + public override string DefaultName => "a meer mage"; + [Constructible] public MeerMage() : base( AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4 ) { - Name = "a meer mage"; Body = 770; SetStr( 171, 200 ); @@ -54,12 +55,12 @@ namespace Server.Mobiles // TODO: Daemon bone ... } - public override bool AutoDispel{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool AutoDispel => true; + public override Poison PoisonImmune => Poison.Lethal; + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 3; } } - public override bool InitialInnocent{ get{ return true; } } + public override bool InitialInnocent => true; public override int GetHurtSound() { @@ -103,7 +104,7 @@ namespace Server.Mobiles if( Utility.RandomDouble() < .1 ) { - int[][] coord = + int[][] coord = { new int[]{-4,-6}, new int[]{4,-6}, new int[]{0,-8}, new int[]{-5,5}, new int[]{5,5} }; @@ -223,4 +224,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs index 3b0c19d77..4d036b0b7 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs @@ -10,10 +10,11 @@ namespace Server.Mobiles [CorpseName( "a meer corpse" )] public class MeerWarrior : BaseCreature { + public override string DefaultName => "a meer warrior"; + [Constructible] public MeerWarrior() : base( AIType.AI_Melee, FightMode.Evil, 10, 1, 0.2, 0.4 ) { - Name = "a meer warrior"; Body = 771; SetStr( 86, 100 ); @@ -47,10 +48,10 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool BardImmune => !Core.AOS; + public override bool CanRummageCorpses => true; - public override bool InitialInnocent{ get{ return true; } } + public override bool InitialInnocent => true; public override void OnDamage( int amount, Mobile from, bool willKill ) { @@ -89,4 +90,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs b/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs index 3bc943ab6..d66b4e0a7 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs @@ -8,8 +8,10 @@ namespace Server.Mobiles [CorpseName( "a cu sidhe corpse" )] public class CuSidhe : BaseMount { + public override string DefaultName => "a cu sidhe"; + [Constructible] - public CuSidhe() : this( "a cu sidhe" ) + public CuSidhe() : this( null ) { } @@ -90,18 +92,15 @@ namespace Server.Mobiles base.OnDoubleClick( from ); } - public override bool CanHeal{ get{ return true; } } - public override bool CanHealOwner{ get{ return true; } } + 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 bool StatLossAfterTame{ get{ return true; } } + public override bool StatLossAfterTame => true; public override int Hides{ get{ return 10; } } public override int Meat{ get{ return 3; } } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.BleedAttack; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack; public CuSidhe( Serial serial ) : base( serial ) { @@ -127,7 +126,7 @@ namespace Server.Mobiles int version = reader.ReadInt(); if ( version < 1 && Name == "a Cu Sidhe" ) - Name = "a cu sidhe"; + Name = null; } } } diff --git a/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs b/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs index 96e749228..d93ed133d 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a ferret corpse" )] public class Ferret : BaseCreature { + public override string DefaultName => "a ferret"; + [Constructible] public Ferret() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a ferret"; Body = 0x117; SetStr( 41, 48 ); @@ -47,7 +48,7 @@ namespace Server.Mobiles { } - public override void OnMovement( Mobile m, Point3D oldLocation ) + public override void OnMovement( Mobile m, Point3D oldLocation ) { if ( m is Ferret && m.InRange( this, 3 ) && m.Alive ) Talk( (Ferret) m ); @@ -75,7 +76,7 @@ namespace Server.Mobiles QuestSystem.FocusTo( this, to ); Say( m_Vocabulary[ Utility.Random( m_Vocabulary.Length ) ] ); - + if ( to != null && Utility.RandomBool() ) Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 5, 8 ) ), new TimerCallback( delegate() { to.Talk(); } ) ); diff --git a/Scripts/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs b/Scripts/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs index 386fcb2c5..4e9492515 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Grizzlybear" )] public class RagingGrizzlyBear : BaseCreature { + public override string DefaultName => "a raging grizzly bear"; + [Constructible] public RagingGrizzlyBear() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a raging grizzly bear"; Body = 212; BaseSoundID = 0xA3; @@ -41,7 +42,7 @@ namespace Server.Mobiles VirtualArmor = 24; Tamable = false; - + } public override int Meat{ get{ return 4; } } diff --git a/Scripts/Mobiles/Monsters/ML/Animal/Squirrel.cs b/Scripts/Mobiles/Monsters/ML/Animal/Squirrel.cs index 30a630f59..729484ccd 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/Squirrel.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/Squirrel.cs @@ -4,13 +4,14 @@ using Server.Mobiles; namespace Server.Mobiles { - [CorpseName( "a squirrel corpse" )] + [CorpseName( "a squirrel corpse" )] public class Squirrel : BaseCreature { + public override string DefaultName => "a squirrell"; + [Constructible] public Squirrel() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a squirrel"; Body = 0x116; SetStr( 44, 50 ); @@ -33,7 +34,7 @@ namespace Server.Mobiles SetSkill( SkillName.Tactics, 4.0 ); SetSkill( SkillName.Wrestling, 4.0 ); - Tamable = true; + Tamable = true; ControlSlots = 1; MinTameSkill = -21.3; } diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs index 023cca646..6c4397bc6 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs @@ -8,12 +8,13 @@ namespace Server.Mobiles [CorpseName( "a Lady Jennifyr corpse" )] public class LadyJennifyr : SkeletalKnight { + public override string DefaultName => "Lady Jennifyr"; + [Constructible] public LadyJennifyr() { IsParagon = true; - Name = "Lady Jennifyr"; Hue = 0x76D; SetStr( 208, 309 ); @@ -114,7 +115,7 @@ namespace Server.Mobiles } */ - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public LadyJennifyr( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/LadyMarai.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/LadyMarai.cs index 5ac9e1cf7..f75bfa06b 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/LadyMarai.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/LadyMarai.cs @@ -8,12 +8,13 @@ namespace Server.Mobiles [CorpseName( "a Lady Marai corpse" )] public class LadyMarai : SkeletalKnight { + public override string DefaultName => "Lady Marai"; + [Constructible] public LadyMarai() { IsParagon = true; - Name = "Lady Marai"; Hue = 0x21; SetStr( 221, 304 ); @@ -47,10 +48,7 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 3 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.CrushingBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow; /* // TODO: Uncomment once added @@ -66,7 +64,7 @@ namespace Server.Mobiles } */ - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public LadyMarai( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterJonath.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterJonath.cs index 62f0a75fe..fee456514 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterJonath.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterJonath.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Master Jonath corpse" )] public class MasterJonath : BoneMagi { + public override string DefaultName => "Master Jonath"; + [Constructible] public MasterJonath() { IsParagon = true; - Name = "Master Jonath"; Hue = 0x455; SetStr( 109, 131 ); @@ -73,7 +74,7 @@ namespace Server.Mobiles } */ - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public override int TreasureMapLevel{ get{ return 5; } } public MasterJonath( Serial serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterMikael.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterMikael.cs index 3d421bb33..d303afe4c 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterMikael.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterMikael.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Master Mikael corpse" )] public class MasterMikael : BoneMagi { + public override string DefaultName => "Master Mikael"; + [Constructible] public MasterMikael() { IsParagon = true; - Name = "Master Mikael"; Hue = 0x8FD; SetStr( 93, 122 ); @@ -72,7 +73,7 @@ namespace Server.Mobiles } */ - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public MasterMikael( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterTheophilus.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterTheophilus.cs index 13aa1bcc1..a39564d8c 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterTheophilus.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterTheophilus.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Master Theophilus corpse" )] public class MasterTheophilus : EvilMageLord { + public override string DefaultName => "Master Theophilus"; + [Constructible] public MasterTheophilus() { IsParagon = true; - Name = "Master Theophilus"; Title = "the necromancer"; Hue = 0; @@ -65,12 +66,9 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 3 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ParalyzingBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow; - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public override int TreasureMapLevel{ get{ return 5; } } public MasterTheophilus( Serial serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/RedDeath.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/RedDeath.cs index e696091be..054321b27 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/RedDeath.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/RedDeath.cs @@ -56,10 +56,7 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 3 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.WhirlwindAttack; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.WhirlwindAttack; public override void OnDeath( Container c ) { @@ -68,9 +65,9 @@ namespace Server.Mobiles c.DropItem( new ResolvesBridle() ); } - public override bool GivesMLMinorArtifact{ get{ return true; } } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool HasBreath{ get{ return true; } } + 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; } } diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/SirPatrick.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/SirPatrick.cs index c3ab1a287..afa9b20eb 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/SirPatrick.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/SirPatrick.cs @@ -9,12 +9,13 @@ namespace Server.Mobiles [CorpseName( "a Sir Patrick corpse" )] public class SirPatrick : SkeletalKnight { + public override string DefaultName => "Sir Patrick"; + [Constructible] public SirPatrick() { IsParagon = true; - Name = "Sir Patrick"; Hue = 0x47E; SetStr( 208, 319 ); @@ -114,7 +115,7 @@ namespace Server.Mobiles } */ - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public SirPatrick( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Abscess.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Abscess.cs index 4277e7497..1d6a04862 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Abscess.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Abscess.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "an Abscess corpse" )] public class Abscess : Hydra { + public override string DefaultName => "Abscess"; + [Constructible] public Abscess() { IsParagon = true; - Name = "Abscess"; Hue = 0x8FD; SetStr( 845, 871 ); @@ -55,7 +56,7 @@ namespace Server.Mobiles c.DropItem( new AbscessTail() ); } - public override bool GivesMLMinorArtifact { get { return true; } } + public override bool GivesMLMinorArtifact => true; public Abscess( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Coil.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Coil.cs index d3416afbb..506af4e70 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Coil.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Coil.cs @@ -9,12 +9,13 @@ namespace Server.Mobiles { // TODO: Check faction allegiance + public override string DefaultName => "Coil"; + [Constructible] public Coil() { IsParagon = true; - Name = "Coil"; Hue = 0x3F; SetStr( 205, 343 ); @@ -51,10 +52,7 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 3 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.MortalStrike; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike; public override void OnDeath( Container c ) { @@ -80,7 +78,7 @@ namespace Server.Mobiles public override Poison HitPoison { get { return Poison.Lethal; } } public override Poison PoisonImmune { get { return Poison.Lethal; } } - public override bool GivesMLMinorArtifact { get { return true; } } + public override bool GivesMLMinorArtifact => true; public override int Hides { get { return 48; } } public override int Meat { get { return 1; } } diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/EnslavedSatyr.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/EnslavedSatyr.cs index 212ec527f..48456959a 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/EnslavedSatyr.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/EnslavedSatyr.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "an enslaved satyr corpse" )] public class EnslavedSatyr : Satyr { + public override string DefaultName => "an enslaved satyr"; + [Constructible] public EnslavedSatyr() { - Name = "an enslaved satyr"; } /* diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs index 7c374358c..32b591329 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs @@ -7,11 +7,12 @@ namespace Server.Mobiles [CorpseName( "a hydra corpse" )] public class Hydra : BaseCreature { + public override string DefaultName => "a hydra"; + [Constructible] public Hydra() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a hydra"; Body = 0x109; BaseSoundID = 0x16A; @@ -64,7 +65,7 @@ namespace Server.Mobiles */ } - public override bool HasBreath { get { return true; } } + 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; } } diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/InsaneDryad.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/InsaneDryad.cs index c9b132fa3..0b7e0b8b6 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/InsaneDryad.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/InsaneDryad.cs @@ -7,13 +7,13 @@ namespace Server.Mobiles [CorpseName( "an insane dryad corpse" )] public class InsaneDryad : MLDryad { - public override bool InitialInnocent { get { return false; } } + public override bool InitialInnocent => false; + + public override string DefaultName => "an insane dryad"; [Constructible] public InsaneDryad() { - Name = "an insane dryad"; - // TODO: Perhaps these should have negative karma? } diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Saliva.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Saliva.cs index 1818a9d48..f617c7950 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Saliva.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Saliva.cs @@ -7,13 +7,14 @@ namespace Server.Mobiles [CorpseName( "a Saliva corpse" )] public class Saliva : Harpy { + public override string DefaultName => "Saliva"; + [Constructible] public Saliva() { // TODO: Not a paragon? No ML arties? // It moves like a paragon on OSI... - Name = "Saliva"; Hue = 0x11E; SetStr( 110, 206 ); diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Tangle.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Tangle.cs index 4ab3a2049..96d1ad324 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Tangle.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Tangle.cs @@ -7,13 +7,14 @@ namespace Server.Mobiles [CorpseName( "a Tangle corpse" )] public class Tangle : BogThing { + public override string DefaultName => "Tangle"; + [Constructible] public Tangle() { // TODO: Not a paragon? No ML arties? // It moves like a paragon on OSI... - Name = "Tangle"; Hue = 0x21; SetStr( 870, 940 ); diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Thrasher.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Thrasher.cs index 8f89d6558..0b3de5469 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Thrasher.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Thrasher.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Thrasher corpse" )] public class Thrasher : Alligator { + public override string DefaultName => "Thrasher"; + [Constructible] public Thrasher() { IsParagon = true; - Name = "Thrasher"; Hue = 0x497; SetStr( 93, 327 ); @@ -43,10 +44,7 @@ namespace Server.Mobiles AddLoot( LootPack.FilthyRich, 4 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ArmorIgnore; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.ArmorIgnore; public override void OnDeath( Container c ) { @@ -55,7 +53,7 @@ namespace Server.Mobiles c.DropItem( new ThrashersTail() ); } - public override bool GivesMLMinorArtifact { get { return true; } } + public override bool GivesMLMinorArtifact => true; public override int Hides { get { return 48; } } public override int Meat { get { return 1; } } diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs index 4ff114dff..a05600b3c 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName("a fetid essence corpse")] public class FetidEssence : BaseCreature { + public override string DefaultName => "a fetid essence"; + [Constructible] public FetidEssence () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a fetid essence"; Body = 273; SetStr( 101, 150 ); @@ -49,8 +50,8 @@ namespace Server.Mobiles AddLoot( LootPack.FilthyRich ); } - public override Poison HitPoison{ get{ return Poison.Deadly; } } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } + public override Poison HitPoison => Poison.Deadly; + public override Poison PoisonImmune => Poison.Deadly; public override int GetAngerSound() { diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs index c56e54727..6c80d1dae 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName("an interred grizzle corpse")] public class InterredGrizzle : BaseCreature { + public override string DefaultName => "a interred grizzle"; + [Constructible] public InterredGrizzle () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an interred grizzle"; Body = 259; SetStr( 451, 500 ); @@ -57,7 +58,7 @@ namespace Server.Mobiles * Damage is resistable (physical) * Acid last 10 seconds */ - + public override int GetAngerSound() { return 0x581; diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs index 383b79c85..ceb156f53 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs @@ -6,17 +6,18 @@ namespace Server.Mobiles [CorpseName( "a dryad's corpse" )] public class MLDryad : BaseCreature { - public override bool InitialInnocent { get { return true; } } + public override bool InitialInnocent => true; public override OppositionGroup OppositionGroup { get { return OppositionGroup.FeyAndUndead; } } + public override string DefaultName => "a dryad"; + [Constructible] public MLDryad() : base( AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4 ) { - Name = "a dryad"; Body = 266; BaseSoundID = 0x57B; diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs index 06703c7a2..a6d2ad4fb 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a satyr's corpse" )] public class Satyr : BaseCreature { + public override string DefaultName => "a satyr"; + [Constructible] public Satyr() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a satyr"; Body = 271; BaseSoundID = 0x586; diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/CorruptedSoul.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/CorruptedSoul.cs index a5c79f981..5d698ecfb 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/CorruptedSoul.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/CorruptedSoul.cs @@ -11,12 +11,13 @@ namespace Server.Mobiles { public class CorruptedSoul : BaseCreature { - public override bool DeleteCorpseOnDeath{ get{ return true; } } - + public override bool DeleteCorpseOnDeath => true; + + public override string DefaultName => "a corrupted soul"; + [Constructible] public CorruptedSoul() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, .1, 5 ) { - Name = "a corrupted soul"; Body = 0x3CA; Hue = 0x453; @@ -46,8 +47,8 @@ namespace Server.Mobiles // VirtualArmor = 6; Not sure } - public override bool AlwaysAttackable{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } // NEED TO VERIFY + public override bool AlwaysAttackable => true; + public override bool BleedImmune => true; // NEED TO VERIFY // NEED TO VERIFY SOUNDS! Known: No Idle Sound. @@ -66,7 +67,7 @@ namespace Server.Mobiles return 0x0; }*/ - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; // TODO: Proper OnDeath Effect diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/FerelTreefellow.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/FerelTreefellow.cs index 5d35e6151..99d3c9b63 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/FerelTreefellow.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/FerelTreefellow.cs @@ -5,17 +5,16 @@ using Server.Items; namespace Server.Mobiles { [CorpseName( "a treefellow corpse" )] - public class FerelTreefellow : BaseCreature + [TypeAlias("Server.Mobiles.FerelTreefellow")] + public class FeralTreefellow : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.Dismount; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; + + public override string DefaultName => "a feral treefellow"; [Constructible] - public FerelTreefellow() : base( AIType.AI_Melee, FightMode.Evil, 10, 1, 0.2, 0.4 ) + public FeralTreefellow() : base( AIType.AI_Melee, FightMode.Evil, 10, 1, 0.2, 0.4 ) { - Name = "a ferel treefellow"; Body = 301; SetStr( 1351, 1600 ); @@ -64,14 +63,14 @@ namespace Server.Mobiles return 672; } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override void GenerateLoot() { AddLoot( LootPack.Average ); //Unknown } - public FerelTreefellow( Serial serial ) : base( serial ) + public FeralTreefellow( Serial serial ) : base( serial ) { } diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Minotaur.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Minotaur.cs index 8c1348c05..1aca2f20f 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Minotaur.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Minotaur.cs @@ -9,15 +9,13 @@ namespace Server.Mobiles [CorpseName( "a minotaur corpse" )] public class Minotaur : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ParalyzingBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow; + + public override string DefaultName => "a minotaur"; [Constructible] public Minotaur() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) // NEED TO CHECK { - Name = "a minotaur"; Body = 263; SetStr( 301, 340 ); diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurCaptain.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurCaptain.cs index bd5270992..f45dcfadd 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurCaptain.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurCaptain.cs @@ -9,15 +9,13 @@ namespace Server.Mobiles [CorpseName( "a minotaur corpse" )] public class MinotaurCaptain : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ParalyzingBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow; + + public override string DefaultName => "a minotaur captain"; [Constructible] public MinotaurCaptain() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) // NEED TO CHECK { - Name = "a minotaur captain"; Body = 280; SetStr( 401, 425 ); diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurScout.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurScout.cs index 09304bc47..1cc4dcaa3 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurScout.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurScout.cs @@ -9,17 +9,15 @@ namespace Server.Mobiles [CorpseName( "a minotaur corpse" )] public class MinotaurScout : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ParalyzingBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow; + + public override string DefaultName => "a minotaur scout"; [Constructible] public MinotaurScout() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) // NEED TO CHECK { - Name = "a minotaur scout"; Body = 281; - + SetStr( 353, 375 ); SetDex( 111, 130 ); SetInt( 34, 50 ); diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/PestilentBandage.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/PestilentBandage.cs index 916489a80..dfbb684c6 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/PestilentBandage.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/PestilentBandage.cs @@ -9,19 +9,21 @@ namespace Server.Mobiles [CorpseName("a pestilent bandage corpse")] public class PestilentBandage : BaseCreature { - // Neither Stratics nor UOGuide have much description - // beyond being a "Grey Mummy". BodyValue, Sound and + // Neither Stratics nor UOGuide have much description + // beyond being a "Grey Mummy". BodyValue, Sound and // Hue are all guessed until they can be verified. // Loot and Fame/Karma are also guesses at this point. // // They also apparently have a Poison Attack, which I've stolen from Yamandons. + + public override string DefaultName => "a pestilent bandage"; + [Constructible] public PestilentBandage() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) // NEED TO CHECK { - Name = "a pestilent bandage"; Body = 154; - Hue = 0x515; - BaseSoundID = 471; + Hue = 0x515; + BaseSoundID = 471; SetStr( 691, 740 ); SetDex( 141, 180 ); @@ -56,8 +58,8 @@ namespace Server.Mobiles } - public override Poison HitPoison{ get{ return Poison.Lethal; } } - public override bool CanHeal { get { return true; } } + public override Poison HitPoison => Poison.Lethal; + public override bool CanHeal => true; public override void GenerateLoot() { AddLoot( LootPack.Rich ); // Need to verify diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs index 16a197d3d..d9548ebbd 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs @@ -6,15 +6,13 @@ namespace Server.Mobiles [CorpseName( "a tormented minotaur corpse" )] public class TormentedMinotaur : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.Dismount; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; + + public override string DefaultName => "Tormented Minotaur"; [Constructible] public TormentedMinotaur() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "Tormented Minotaur"; Body = 262; SetStr( 822, 930 ); @@ -48,7 +46,7 @@ namespace Server.Mobiles AddLoot(LootPack.FilthyRich, 10); } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } + public override Poison PoisonImmune => Poison.Deadly; public override int TreasureMapLevel{ get{ return 3; } } public override int GetDeathSound() { return 0x596; } diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Troglodyte.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Troglodyte.cs index 783600598..272d2cf09 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Troglodyte.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Troglodyte.cs @@ -9,12 +9,13 @@ namespace Server.Mobiles [CorpseName( "a troglodyte corpse" )] public class Troglodyte : BaseCreature { + public override string DefaultName => "a troglodyte"; + [Constructible] public Troglodyte() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) // NEED TO CHECK { - Name = "a troglodyte"; Body = 267; - BaseSoundID = 0x59F; + BaseSoundID = 0x59F; SetStr( 148, 217 ); SetDex( 91, 120 ); @@ -47,7 +48,7 @@ namespace Server.Mobiles PackItem( new Ribs() ); } - public override bool CanHeal { get { return true; } } + public override bool CanHeal => true; public override void GenerateLoot() { diff --git a/Scripts/Mobiles/Monsters/ML/Labyrinth/Miasma.cs b/Scripts/Mobiles/Monsters/ML/Labyrinth/Miasma.cs index a3632bbe9..ccb6d5c9b 100644 --- a/Scripts/Mobiles/Monsters/ML/Labyrinth/Miasma.cs +++ b/Scripts/Mobiles/Monsters/ML/Labyrinth/Miasma.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Miasma corpse" )] public class Miasma : Scorpion { + public override string DefaultName => "Miasma"; + [Constructible] public Miasma() { IsParagon = true; - Name = "Miasma"; Hue = 0x8FD; SetStr( 255, 847 ); @@ -47,8 +48,8 @@ namespace Server.Mobiles 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 bool HasManaOveride { get { return true; } } - public override bool GivesMLMinorArtifact { get { return true; } } + public override bool HasManaOveride => true; + public override bool GivesMLMinorArtifact => true; public override int TreasureMapLevel { get { return 5; } } public override void GenerateLoot() @@ -56,10 +57,7 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 4 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.MortalStrike; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike; /* // TODO: uncomment once added diff --git a/Scripts/Mobiles/Monsters/ML/Labyrinth/Pyre.cs b/Scripts/Mobiles/Monsters/ML/Labyrinth/Pyre.cs index 8cad11581..b3b213576 100644 --- a/Scripts/Mobiles/Monsters/ML/Labyrinth/Pyre.cs +++ b/Scripts/Mobiles/Monsters/ML/Labyrinth/Pyre.cs @@ -10,12 +10,13 @@ namespace Server.Mobiles [CorpseName( "a Pyre corpse" )] public class Pyre : Phoenix { + public override string DefaultName => "Pyre"; + [Constructible] public Pyre() { IsParagon = true; - Name = "Pyre"; Hue = 0x489; FightMode = FightMode.Closest; @@ -61,9 +62,9 @@ namespace Server.Mobiles return WeaponAbility.BleedAttack; } - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public override int TreasureMapLevel{ get{ return 5; } } - public override bool HasAura{ get{ return true; } } + public override bool HasAura => true; public Pyre( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Labyrinth/Rend.cs b/Scripts/Mobiles/Monsters/ML/Labyrinth/Rend.cs index e21c6413b..a5d35ffd8 100644 --- a/Scripts/Mobiles/Monsters/ML/Labyrinth/Rend.cs +++ b/Scripts/Mobiles/Monsters/ML/Labyrinth/Rend.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Rend corpse" )] public class Rend : Reptalon { + public override string DefaultName => "Rend"; + [Constructible] public Rend() { IsParagon = true; - Name = "Rend"; Hue = 0x455; SetStr( 1261, 1284 ); @@ -55,7 +56,7 @@ namespace Server.Mobiles return WeaponAbility.BleedAttack; } - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public Rend( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs b/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs index 9ef621740..0b7782036 100644 --- a/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs +++ b/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs @@ -7,12 +7,12 @@ namespace Server.Mobiles [CorpseName( "a dragon corpse" )] public class GreaterDragon : BaseCreature { - public override bool StatLossAfterTame { get { return true; } } + public override bool StatLossAfterTame => true; + public override string DefaultName => "a greater dragon"; [Constructible] public GreaterDragon () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.3, 0.5 ) { - Name = "a greater dragon"; Body = Utility.RandomList( 12, 59 ); BaseSoundID = 362; @@ -58,9 +58,9 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 8 ); } - public override bool ReacquireOnMovement{ get{ return !Controlled; } } - public override bool HasBreath{ get{ return true; } } // fire breath enabled - public override bool AutoDispel{ get{ return !Controlled; } } + 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; } } @@ -68,13 +68,10 @@ namespace Server.Mobiles 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 bool CanAngerOnTame { get { return true; } } - public override bool CanFly { get { return true; } } + public override bool CanAngerOnTame => true; + public override bool CanFly => true; - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.BleedAttack; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack; public GreaterDragon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs b/Scripts/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs index a82f99dd1..6f5157c10 100644 --- a/Scripts/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs +++ b/Scripts/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a slimey corpse" )] public class CorrosiveSlime : BaseCreature { + public override string DefaultName { get { return "a corrosive slime"; } } + [Constructible] public CorrosiveSlime() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a corrosive slime"; Body = 51; BaseSoundID = 456; diff --git a/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs b/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs index 9453dd7bf..1ffbbc7e9 100644 --- a/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs +++ b/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs @@ -19,7 +19,7 @@ namespace Server.Mobiles SetHits( 833, 931 ); SetDamage( 21, 28 ); - + SetDamageType( ResistanceType.Physical, 0 ); SetDamageType( ResistanceType.Poison, 25 ); SetDamageType( ResistanceType.Energy, 75 ); @@ -34,7 +34,7 @@ namespace Server.Mobiles SetSkill( SkillName.Tactics, 101.7, 108.2 ); SetSkill( SkillName.MagicResist, 76.4, 89.9 ); SetSkill( SkillName.Anatomy, 56.4, 59.7 ); - + Tamable = true; ControlSlots = 4; MinTameSkill = 101.1; @@ -45,19 +45,16 @@ namespace Server.Mobiles AddLoot( LootPack.AosUltraRich, 3 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ParalyzingBlow; - } + 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 bool CanBreath{ get{ return true; } } + public override bool CanBreath => true; public override bool CanAngerOnTame{ get { return true; } } - public override bool StatLossAfterTame{ get{ return true; } } + public override bool StatLossAfterTame => true; public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public Reptalon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/ML/Painted Caves/Grobu.cs b/Scripts/Mobiles/Monsters/ML/Painted Caves/Grobu.cs index 3b3454173..7aa4c0c95 100644 --- a/Scripts/Mobiles/Monsters/ML/Painted Caves/Grobu.cs +++ b/Scripts/Mobiles/Monsters/ML/Painted Caves/Grobu.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Grobu corpse" )] public class Grobu : BlackBear { + public override string DefaultName => "Grobu"; + [Constructible] public Grobu() { IsParagon = true; - Name = "Grobu"; Hue = 0x455; AI = AIType.AI_Melee; @@ -57,7 +58,7 @@ namespace Server.Mobiles c.DropItem( new GrobusFur() ); } - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public Grobu( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Painted Caves/Lurg.cs b/Scripts/Mobiles/Monsters/ML/Painted Caves/Lurg.cs index da3ea6055..7584e4de9 100644 --- a/Scripts/Mobiles/Monsters/ML/Painted Caves/Lurg.cs +++ b/Scripts/Mobiles/Monsters/ML/Painted Caves/Lurg.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Lurg corpse" )] public class Lurg : Troglodyte { + public override string DefaultName => "Lurg"; + [Constructible] public Lurg() { IsParagon = true; - Name = "Lurg"; Hue = 0x455; SetStr( 584, 625 ); @@ -48,12 +49,9 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 2 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.CrushingBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow; - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public override int TreasureMapLevel{ get{ return 4; } } public Lurg( Serial serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Palace of Paroxysmus/Putrefier.cs b/Scripts/Mobiles/Monsters/ML/Palace of Paroxysmus/Putrefier.cs index 3bd535a47..810d58ca3 100644 --- a/Scripts/Mobiles/Monsters/ML/Palace of Paroxysmus/Putrefier.cs +++ b/Scripts/Mobiles/Monsters/ML/Palace of Paroxysmus/Putrefier.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Putrefier corpse" )] public class Putrefier : Balron { + public override string DefaultName => "Putrefier"; + [Constructible] public Putrefier() { IsParagon = true; - Name = "Putrefier"; Hue = 63; SetStr( 1057, 1400 ); @@ -68,8 +69,8 @@ namespace Server.Mobiles } */ - public override bool GivesMLMinorArtifact{ get{ return true; } } - public override Poison HitPoison{ get{ return Poison.Deadly; } } // Becomes Lethal with Paragon bonus + public override bool GivesMLMinorArtifact => true; + public override Poison HitPoison => Poison.Deadly; // Becomes Lethal with Paragon bonus public override int TreasureMapLevel{ get{ return 5; } } public Putrefier( Serial serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs index 289b2b698..7bde34f5a 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs @@ -7,11 +7,12 @@ namespace Server.Mobiles [CorpseName( "a corporeal brume corpse" )] public class CorporealBrume : BaseCreature { + public override string DefaultName { get { return "a corporeal brume"; } } + [Constructible] public CorporealBrume() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a corporeal brume"; Body = 0x104; // TODO: Verify BaseSoundID = 0x56B; diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs index 54bff9627..8dce255fb 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs @@ -7,11 +7,12 @@ namespace Server.Mobiles [CorpseName( "a crystal daemon corpse" )] public class CrystalDaemon : BaseCreature { + public override string DefaultName { get { return "a crystal daemon"; } } + [Constructible] public CrystalDaemon() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a crystal daemon"; Body = 0x310; Hue = 0x3E8; BaseSoundID = 0x47D; diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs index b28059746..ae6255d58 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs @@ -7,11 +7,12 @@ namespace Server.Mobiles [CorpseName( "a Crystal Lattice Seeker corpse" )] public class CrystalLatticeSeeker : BaseCreature { + public override string DefaultName { get { return "Crystal Lattice Seeker"; } } + [Constructible] public CrystalLatticeSeeker() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "Crystal Lattice Seeker"; Body = 0x7B; Hue = 0x47E; diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalSeaSerpent.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalSeaSerpent.cs index 6c83d963a..efd29cf79 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalSeaSerpent.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalSeaSerpent.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a crystal sea serpent corpse" )] public class CrystalSeaSerpent : SeaSerpent { + public override string DefaultName { get { return "a crystal sea serpent"; } } + [Constructible] public CrystalSeaSerpent() { - Name = "a crystal sea serpent"; Hue = 0x47E; SetStr( 250, 450 ); diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs index d39f186c3..f3c18312e 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs @@ -7,11 +7,12 @@ namespace Server.Mobiles [CorpseName( "a crystal vortex corpse" )] public class CrystalVortex : BaseCreature { + public override string DefaultName { get { return "a crystal vortex"; } } + [Constructible] public CrystalVortex() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a crystal vortex"; Body = 0xD; Hue = 0x2B2; BaseSoundID = 0x107; diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalWisp.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalWisp.cs index 570474cca..94f6f5ad1 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalWisp.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalWisp.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles { public class CrystalWisp : Wisp { + public override string DefaultName { get { return "a crystal wisp"; } } + [Constructible] public CrystalWisp() { - Name = "a crystal wisp"; Hue = 0x482; PackArcaneScroll( 0, 1 ); diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/MantraEffervescence.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/MantraEffervescence.cs index 1f1633e74..be2d5af3b 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/MantraEffervescence.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/MantraEffervescence.cs @@ -7,11 +7,12 @@ namespace Server.Mobiles [CorpseName( "a mantra effervescence corpse" )] public class MantraEffervescence : BaseCreature { + public override string DefaultName => "a mantra effervescence"; + [Constructible] public MantraEffervescence() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a mantra effervescence"; Body = 0x111; BaseSoundID = 0x56E; diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/Protector.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/Protector.cs index a05db7572..0ef86014a 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/Protector.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/Protector.cs @@ -7,6 +7,8 @@ namespace Server.Mobiles [CorpseName( "a human corpse" )] public class Protector : BaseCreature { + public override string DefaultName => "a Protector"; + [Constructible] public Protector() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -17,7 +19,6 @@ namespace Server.Mobiles HairItemID = Race.Human.RandomHair( this ); HairHue = Race.Human.RandomHairHue(); - Name = "a Protector"; Title = "the mystic llamaherder"; SetStr( 700, 800 ); @@ -57,9 +58,9 @@ namespace Server.Mobiles AddItem( shroud ); } - public override bool AlwaysMurderer { get { return true; } } - public override bool PropertyTitle { get { return false; } } - public override bool ShowFameTitle { get { return false; } } + public override bool AlwaysMurderer => true; + public override bool PropertyTitle => false; + public override bool ShowFameTitle => false; public Protector( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/UnfrozenMummy.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/UnfrozenMummy.cs index e8f3144a9..250a20e26 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/UnfrozenMummy.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/UnfrozenMummy.cs @@ -7,11 +7,12 @@ namespace Server.Mobiles [CorpseName( "an unfrozen mummy corpse" )] public class UnfrozenMummy : BaseCreature { + public override string DefaultName => "an unfrozen mummy"; + [Constructible] public UnfrozenMummy() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.4, 0.8 ) { - Name = "an unfrozen mummy"; Body = 0x9B; Hue = 0x480; BaseSoundID = 0x1D7; diff --git a/Scripts/Mobiles/Monsters/ML/Sanctuary/Chiikkaha.cs b/Scripts/Mobiles/Monsters/ML/Sanctuary/Chiikkaha.cs index 1677020fb..d8e5aabb8 100644 --- a/Scripts/Mobiles/Monsters/ML/Sanctuary/Chiikkaha.cs +++ b/Scripts/Mobiles/Monsters/ML/Sanctuary/Chiikkaha.cs @@ -9,11 +9,11 @@ namespace Server.Mobiles [CorpseName( "a Chiikkaha the Toothed corpse" )] public class Chiikkaha : RatmanMage { + public override string DefaultName { get { return "Chiikkaha the Toothed"; } } + [Constructible] public Chiikkaha() { - Name = "Chiikkaha the Toothed"; - SetStr( 450, 476 ); SetDex( 157, 179 ); SetInt( 251, 275 ); diff --git a/Scripts/Mobiles/Monsters/ML/Sanctuary/MougGuur.cs b/Scripts/Mobiles/Monsters/ML/Sanctuary/MougGuur.cs index 94b26e319..8c257af5e 100644 --- a/Scripts/Mobiles/Monsters/ML/Sanctuary/MougGuur.cs +++ b/Scripts/Mobiles/Monsters/ML/Sanctuary/MougGuur.cs @@ -8,11 +8,11 @@ namespace Server.Mobiles [CorpseName( "a Moug-Guur corpse" )] public class MougGuur : Ettin { + public override string DefaultName => "Moug-Guur"; + [Constructible] public MougGuur() { - Name = "Moug-Guur"; - SetStr( 556, 575 ); SetDex( 84, 94 ); SetInt( 59, 73 ); diff --git a/Scripts/Mobiles/Monsters/ML/Sanctuary/Szavetra.cs b/Scripts/Mobiles/Monsters/ML/Sanctuary/Szavetra.cs index d30bfb00d..006d7f1d2 100644 --- a/Scripts/Mobiles/Monsters/ML/Sanctuary/Szavetra.cs +++ b/Scripts/Mobiles/Monsters/ML/Sanctuary/Szavetra.cs @@ -8,11 +8,11 @@ namespace Server.Mobiles [CorpseName( "a Szavetra corpse" )] public class Szavetra : Succubus { + public override string DefaultName => "Szavetra"; + [Constructible] public Szavetra() { - Name = "Szavetra"; - SetStr( 627, 655 ); SetDex( 164, 193 ); SetInt( 566, 595 ); diff --git a/Scripts/Mobiles/Monsters/ML/Special/Ilhenir.cs b/Scripts/Mobiles/Monsters/ML/Special/Ilhenir.cs index b3ef98ea8..703ec6998 100644 --- a/Scripts/Mobiles/Monsters/ML/Special/Ilhenir.cs +++ b/Scripts/Mobiles/Monsters/ML/Special/Ilhenir.cs @@ -9,38 +9,35 @@ using Server.Engines.CannedEvil; namespace Server.Mobiles { - [CorpseName( "a corpse of Ilhenir" )] + [CorpseName("a corpse of Ilhenir")] public class Ilhenir : BaseChampion { - public override ChampionSkullType SkullType { get { return ChampionSkullType.Pain; } } + public override ChampionSkullType SkullType => ChampionSkullType.Pain; - public override Type[] UniqueList { get { return new Type[] { }; } } - public override Type[] SharedList - { - get - { - return new Type[] { typeof( ANecromancerShroud ), - typeof( LieutenantOfTheBritannianRoyalGuard ), - typeof( OblivionsNeedle ), - typeof( TheRobeOfBritanniaAri ) }; - } - } - public override Type[] DecorativeList { get { return new Type[] { typeof( MonsterStatuette ) }; } } + public override Type[] UniqueList => new Type[] { }; - public override MonsterStatuetteType[] StatueTypes + public override Type[] SharedList => new [] { - get - { - return new MonsterStatuetteType[] { MonsterStatuetteType.PlagueBeast, - MonsterStatuetteType.RedDeath }; - } - } + typeof(ANecromancerShroud), + typeof(LieutenantOfTheBritannianRoyalGuard), + typeof(OblivionsNeedle), + typeof(TheRobeOfBritanniaAri), + }; + + public override Type[] DecorativeList => new [] { typeof(MonsterStatuette) }; + + public override MonsterStatuetteType[] StatueTypes => new [] + { + MonsterStatuetteType.PlagueBeast, + MonsterStatuetteType.RedDeath, + }; + + public override string DefaultName => "Ilhenir"; [Constructible] public Ilhenir() : base( AIType.AI_Mage ) { - Name = "Ilhenir"; Title = "the Stained"; Body = 0x103; @@ -149,11 +146,11 @@ namespace Server.Mobiles } } - public override bool Unprovokable { get { return true; } } - public override bool Uncalmable { get { return true; } } - public override Poison PoisonImmune { get { return Poison.Lethal; } } - //public override bool GivesMLMinorArtifact { get { return true; } } // TODO: Needs verification - public override int TreasureMapLevel { get { return 5; } } + public override bool Unprovokable => true; + public override bool Uncalmable => true; + public override Poison PoisonImmune => Poison.Lethal; + //public override bool GivesMLMinorArtifact => true; // TODO: Needs verification + public override int TreasureMapLevel => 5; public override void OnGaveMeleeAttack( Mobile defender ) { diff --git a/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs b/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs index 245220a9b..ecf19c8f0 100644 --- a/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs +++ b/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs @@ -11,27 +11,28 @@ namespace Server.Mobiles [CorpseName( "the remains of Meraktus" )] public class Meraktus : BaseChampion { - public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Pain; } } + public override ChampionSkullType SkullType => ChampionSkullType.Pain; - public override Type[] UniqueList{ get{ return new Type[] { typeof( Subdue ) }; } } - public override Type[] SharedList{ get{ return new Type[] { }; } } - public override Type[] DecorativeList{ get{ return new Type[] { typeof( ArtifactLargeVase ), - typeof( ArtifactVase ), - typeof( MinotaurStatueDeed ) }; } } + public override Type[] UniqueList => new [] { typeof( Subdue ) }; + public override Type[] SharedList => new Type[] { }; - public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { - MonsterStatuetteType.Minotaur }; } } - - public override WeaponAbility GetWeaponAbility() + public override Type[] DecorativeList => new Type[] { - return WeaponAbility.Dismount; - } + typeof(ArtifactLargeVase), + typeof(ArtifactVase), + typeof(MinotaurStatueDeed), + }; + + public override MonsterStatuetteType[] StatueTypes => new [] { MonsterStatuetteType.Minotaur }; + + public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; + + public override string DefaultName => "Meraktus"; [Constructible] public Meraktus() : base(AIType.AI_Melee) { - Name = "Meraktus"; Title = "the Tormented"; Body = 263; BaseSoundID = 680; @@ -99,7 +100,7 @@ namespace Server.Mobiles public override void OnDeath( Container c ) { - base.OnDeath( c ); + base.OnDeath( c ); if ( Core.ML ) { c.DropItem( new MalletAndChisel() ); @@ -154,11 +155,11 @@ namespace Server.Mobiles public override int Meat { get { return 2; } } public override int Hides { get { return 10; } } public override HideType HideType { get { return HideType.Regular; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; public override int TreasureMapLevel{ get{ return 3; } } - public override bool BardImmune{ get{ return true; } } - public override bool Unprovokable{ get{ return true; } } - public override bool Uncalmable { get { return true; } } + public override bool BardImmune => true; + public override bool Unprovokable => true; + public override bool Uncalmable => true; public override void OnGaveMeleeAttack(Mobile defender) { diff --git a/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs b/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs index 741d42fc1..43bcf4bc4 100644 --- a/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs +++ b/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs @@ -19,11 +19,12 @@ namespace Server.Mobiles public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { MonsterStatuetteType.DreadHorn }; } } + public override string DefaultName => "Twaulo"; + [Constructible] public Twaulo() : base(AIType.AI_Melee) { - Name = "Twaulo"; Title = "of the Glade"; Body = 101; BaseSoundID = 679; @@ -75,8 +76,8 @@ namespace Server.Mobiles get{ return OppositionGroup.FeyAndUndead; } } - public override bool Unprovokable{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + 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; } } diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs index 27d403dc2..e5e59ea2e 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs @@ -14,14 +14,13 @@ namespace Server.Mobiles [CorpseName( "a changeling corpse" )] public class Changeling : BaseCreature { - public virtual string DefaultName{ get{ return "a changeling"; } } - public virtual int DefaultHue{ get{ return 0; } } + public override string DefaultName => "a changeling"; + public virtual int DefaultHue => 0; [Constructible] public Changeling() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = DefaultName; Body = 264; Hue = DefaultHue; @@ -61,8 +60,8 @@ namespace Server.Mobiles PackArcaneScroll( 0, 1 ); } - public override bool ShowFameTitle{ get{ return false; } } - public override bool InitialInnocent{ get{ return ( m_MorphedInto != null ); } } + public override bool ShowFameTitle => false; + public override bool InitialInnocent => m_MorphedInto != null; public override void GenerateLoot() { @@ -145,7 +144,7 @@ namespace Server.Mobiles } } - private static readonly int[] m_FireNorth = new int[] + private static readonly int[] m_FireNorth = { -1, -1, 1, -1, @@ -153,7 +152,7 @@ namespace Server.Mobiles 1, 2 }; - private static readonly int[] m_FireEast = new int[] + private static readonly int[] m_FireEast = { -1, 0, 2, 0 diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Gnaw.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Gnaw.cs index d642db7a2..409de0d4f 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Gnaw.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Gnaw.cs @@ -7,12 +7,13 @@ namespace Server.Mobiles [CorpseName( "a Gnaw corpse" )] public class Gnaw : DireWolf { + public override string DefaultName => "Gnaw"; + [Constructible] public Gnaw() { IsParagon = true; - Name = "Gnaw"; Hue = 0x130; SetStr( 151, 172 ); @@ -46,7 +47,7 @@ namespace Server.Mobiles AddLoot( LootPack.FilthyRich, 2 ); } - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public override int Hides{ get{ return 28; } } public override int Meat{ get{ return 4; } } diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Guile.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Guile.cs index abe680ebc..3d6b3a1a5 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Guile.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Guile.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a Guile corpse" )] public class Guile : Changeling { - public override string DefaultName{ get{ return "Guile"; } } + public override string DefaultName => "Guile"; public override int DefaultHue{ get{ return 0x3F; } } [Constructible] @@ -61,7 +61,7 @@ namespace Server.Mobiles } } - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public override void GenerateLoot() { diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Irk.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Irk.cs index c0c954e93..3a0d94f34 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Irk.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Irk.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "an Irk corpse" )] public class Irk : Changeling { - public override string DefaultName{ get{ return "Irk"; } } + public override string DefaultName => "Irk"; public override int DefaultHue{ get{ return 0x489; } } [Constructible] @@ -46,7 +46,7 @@ namespace Server.Mobiles // TODO: Angry fire - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public override void GenerateLoot() { diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadyLissith.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadyLissith.cs index 5da30d9e4..efdc560bb 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadyLissith.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadyLissith.cs @@ -8,12 +8,12 @@ namespace Server.Mobiles [CorpseName( "a Lady Lissith corpse" )] public class LadyLissith : GiantBlackWidow { + public override string DefaultName => "Lady Lissith"; + [Constructible] public LadyLissith() { IsParagon = true; - - Name = "Lady Lissith"; Hue = 0x452; SetStr( 81, 130 ); @@ -49,10 +49,7 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 2 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.BleedAttack; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack; /* // TODO: uncomment once added @@ -71,7 +68,7 @@ namespace Server.Mobiles } */ - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public LadyLissith( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadySabrix.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadySabrix.cs index fa7b3f01a..e57abbd4d 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadySabrix.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadySabrix.cs @@ -7,12 +7,12 @@ namespace Server.Mobiles [CorpseName( "a Lady Sabrix corpse" )] public class LadySabrix : GiantBlackWidow { + public override string DefaultName => "Lady Sabrix"; + [Constructible] public LadySabrix() { IsParagon = true; - - Name = "Lady Sabrix"; Hue = 0x497; SetStr( 82, 130 ); @@ -48,10 +48,7 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 2 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ArmorIgnore; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.ArmorIgnore; /* // TODO: uncomment once added @@ -76,7 +73,7 @@ namespace Server.Mobiles } */ - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public LadySabrix( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Malefic.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Malefic.cs index c1f5f2ac7..aeb9a48a4 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Malefic.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Malefic.cs @@ -7,12 +7,12 @@ namespace Server.Mobiles [CorpseName( "a Malefic corpse" )] public class Malefic : DreadSpider { + public override string DefaultName => "Malefic"; + [Constructible] public Malefic() { IsParagon = true; - - Name = "Malefic"; Hue = 0x455; SetStr( 210, 284 ); @@ -56,12 +56,9 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 3 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.Dismount; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public Malefic( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Silk.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Silk.cs index 2f31c7ac7..74b037955 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Silk.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Silk.cs @@ -7,12 +7,12 @@ namespace Server.Mobiles [CorpseName( "a Silk corpse" )] public class Silk : GiantBlackWidow { + public override string DefaultName => "Silk"; + [Constructible] public Silk() { IsParagon = true; - - Name = "Silk"; Hue = 0x47E; SetStr( 80, 131 ); @@ -48,12 +48,9 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 2 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.ParalyzingBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow; - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public Silk( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Spite.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Spite.cs index f55d59c6f..c83446875 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Spite.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Spite.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a Spite corpse" )] public class Spite : Changeling { - public override string DefaultName{ get{ return "Spite"; } } + public override string DefaultName => "Spite"; public override int DefaultHue{ get{ return 0x21; } } [Constructible] @@ -51,7 +51,7 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 2 ); } - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public Spite( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs index f42e3d84c..a64588bf4 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs @@ -8,12 +8,12 @@ namespace Server.Mobiles [CorpseName( "a Swoop corpse" )] public class Swoop : Eagle { + public override string DefaultName => "Swoop"; + [Constructible] public Swoop() { IsParagon = true; - - Name = "Swoop"; Hue = 0xE0; AI = AIType.AI_Melee; @@ -109,8 +109,8 @@ namespace Server.Mobiles } } - public override bool CanFly { get { return true; } } - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool CanFly => true; + public override bool GivesMLMinorArtifact => true; public override int Feathers{ get{ return 72; } } /* diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Virulent.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Virulent.cs index 4b0430355..391ac22fc 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Virulent.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Virulent.cs @@ -7,12 +7,12 @@ namespace Server.Mobiles [CorpseName( "a Virulent corpse" )] public class Virulent : DreadSpider { + public override string DefaultName => "Virulent"; + [Constructible] public Virulent() { IsParagon = true; - - Name = "Virulent"; Hue = 0x8FD; SetStr( 207, 252 ); @@ -50,10 +50,7 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 3 ); } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.MortalStrike; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike; /* // TODO: uncomment once added @@ -75,7 +72,7 @@ namespace Server.Mobiles } */ - public override bool GivesMLMinorArtifact{ get{ return true; } } + public override bool GivesMLMinorArtifact => true; public Virulent( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Mammal/Melee/HellHound.cs b/Scripts/Mobiles/Monsters/Mammal/Melee/HellHound.cs index 7743ca405..9aaf3ff7f 100644 --- a/Scripts/Mobiles/Monsters/Mammal/Melee/HellHound.cs +++ b/Scripts/Mobiles/Monsters/Mammal/Melee/HellHound.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a hell hound corpse" )] public class HellHound : BaseCreature { + public override string DefaultName => "a hell hound"; + [Constructible] public HellHound() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a hell hound"; Body = 98; BaseSoundID = 229; @@ -49,7 +50,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool HasBreath => true; // fire breath enabled public override int Meat{ get{ return 1; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } public override PackInstinct PackInstinct{ get{ return PackInstinct.Canine; } } @@ -70,4 +71,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs b/Scripts/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs index 75fbb5e25..cecfc0329 100644 --- a/Scripts/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs +++ b/Scripts/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a vorpal bunny corpse" )] public class VorpalBunny : BaseCreature { + public override string DefaultName => "a vorpal bunny"; + [Constructible] public VorpalBunny() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a vorpal bunny"; Body = 205; Hue = 0x480; @@ -54,11 +55,12 @@ namespace Server.Mobiles public class BunnyHole : Item { + public override string DefaultName => "a mysterious rabbit hole"; + public BunnyHole() : base( 0x913 ) { Movable = false; Hue = 1; - Name = "a mysterious rabbit hole"; Timer.DelayCall( TimeSpan.FromSeconds( 40.0 ), new TimerCallback( Delete ) ); } @@ -105,7 +107,7 @@ namespace Server.Mobiles public override int Meat{ get{ return 1; } } public override int Hides{ get{ return 1; } } - public override bool BardImmune{ get{ return !Core.AOS; } } + public override bool BardImmune => !Core.AOS; public VorpalBunny( Serial serial ) : base( serial ) { @@ -142,4 +144,4 @@ namespace Server.Mobiles DelayBeginTunnel(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Magic/DarkWisp.cs b/Scripts/Mobiles/Monsters/Misc/Magic/DarkWisp.cs index 41e68d1c9..10e3e0413 100644 --- a/Scripts/Mobiles/Monsters/Misc/Magic/DarkWisp.cs +++ b/Scripts/Mobiles/Monsters/Misc/Magic/DarkWisp.cs @@ -15,10 +15,11 @@ namespace Server.Mobiles public override TimeSpan ReacquireDelay { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override string DefaultName => "a wisp"; + [Constructible] public DarkWisp() : base( AIType.AI_Mage, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a wisp"; Body = 165; BaseSoundID = 466; @@ -81,4 +82,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs b/Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs index bd449c139..0ca36fd9a 100644 --- a/Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs +++ b/Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs @@ -3,16 +3,16 @@ using Server; using Server.Items; using Server.Gumps; -namespace Server.Mobiles -{ - [CorpseName( "an ethereal warrior corpse" )] - public class EtherealWarrior : BaseCreature - { - public override bool InitialInnocent{ get{ return true; } } +namespace Server.Mobiles +{ + [CorpseName( "an ethereal warrior corpse" )] + public class EtherealWarrior : BaseCreature + { + public override bool InitialInnocent => true; - [Constructible] - public EtherealWarrior() : base( AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4 ) - { + [Constructible] + public EtherealWarrior() : base( AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4 ) + { Name = NameList.RandomName( "ethereal warrior" ); Body = 123; @@ -129,20 +129,20 @@ namespace Server.Mobiles attacker.Mana -= Utility.Random( 10, 10 ); } - public EtherealWarrior( Serial serial ) : base( serial ) - { - } + public EtherealWarrior( Serial serial ) : base( serial ) + { + } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); - writer.Write( (int) 0 ); - } + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); + writer.Write( (int) 0 ); + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); - int version = reader.ReadInt(); - } + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); + int version = reader.ReadInt(); + } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Magic/Pixie.cs b/Scripts/Mobiles/Monsters/Misc/Magic/Pixie.cs index d2be89a16..227911f05 100644 --- a/Scripts/Mobiles/Monsters/Misc/Magic/Pixie.cs +++ b/Scripts/Mobiles/Monsters/Misc/Magic/Pixie.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles [CorpseName( "a pixie corpse" )] public class Pixie : BaseCreature { - public override bool InitialInnocent{ get{ return true; } } + public override bool InitialInnocent => true; [Constructible] public Pixie() : base( AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4 ) @@ -88,4 +88,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Magic/ShadowWisp.cs b/Scripts/Mobiles/Monsters/Misc/Magic/ShadowWisp.cs index 1973b7127..67f91d81c 100644 --- a/Scripts/Mobiles/Monsters/Misc/Magic/ShadowWisp.cs +++ b/Scripts/Mobiles/Monsters/Misc/Magic/ShadowWisp.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a wisp corpse" )] public class ShadowWisp : BaseCreature { + public override string DefaultName => "a shadow wisp"; + [Constructible] public ShadowWisp() : base( AIType.AI_Mage, FightMode.Aggressor, 10, 1, 0.3, 0.6 ) { - Name = "a shadow wisp"; Body = 165; BaseSoundID = 466; @@ -78,4 +79,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Magic/Wisp.cs b/Scripts/Mobiles/Monsters/Misc/Magic/Wisp.cs index 45aca3ae5..e10448ec8 100644 --- a/Scripts/Mobiles/Monsters/Misc/Magic/Wisp.cs +++ b/Scripts/Mobiles/Monsters/Misc/Magic/Wisp.cs @@ -16,10 +16,11 @@ namespace Server.Mobiles public override TimeSpan ReacquireDelay { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override string DefaultName => "a wisp"; + [Constructible] public Wisp() : base( AIType.AI_Mage, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - Name = "a wisp"; Body = 58; BaseSoundID = 466; @@ -84,4 +85,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs b/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs index b8f3261b2..e7cc6bdc3 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs @@ -5,8 +5,8 @@ namespace Server.Mobiles [CorpseName( "an animated weapon corpse" )] public class AnimatedWeapon : BaseCreature { - public override bool DeleteCorpseOnDeath { get { return true; } } - public override bool IsHouseSummonable { get { return true; } } + public override bool DeleteCorpseOnDeath => true; + public override bool IsHouseSummonable => true; public override double DispelDifficulty { get { return 0.0; } } public override double DispelFocus { get { return 20.0; } } @@ -16,11 +16,12 @@ namespace Server.Mobiles return m.Str / Math.Max( this.GetDistanceToSqrt( m ), 1.0 ); } + public override string DefaultName => "an animated weapon"; + [Constructible] public AnimatedWeapon( Mobile caster, int level ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.3, 0.6 ) { - Name = "an animated weapon"; Body = 692; SetStr( 10 + level ); @@ -69,7 +70,7 @@ namespace Server.Mobiles ControlSlots = 4; } - public override bool BleedImmune { get { return true; } } + public override bool BleedImmune => true; public override Poison PoisonImmune { get { return Poison.Lethal; } } public override int GetAngerSound() diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs b/Scripts/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs index 9ef53f3ac..a34f1df01 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles public class BladeSpirits : BaseCreature { public override bool DeleteCorpseOnDeath { get { return Core.AOS; } } - public override bool IsHouseSummonable { get { return true; } } + public override bool IsHouseSummonable => true; public override double DispelDifficulty { get { return 0.0; } } public override double DispelFocus { get { return 20.0; } } @@ -19,11 +19,12 @@ namespace Server.Mobiles return ( m.Str + m.Skills[SkillName.Tactics].Value ) / Math.Max( GetDistanceToSqrt( m ), 1.0 ); } + public override string DefaultName => "a blade spirit"; + [Constructible] public BladeSpirits() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.3, 0.6 ) { - Name = "a blade spirit"; Body = 574; SetStr( 150 ); @@ -57,7 +58,7 @@ namespace Server.Mobiles ControlSlots = ( Core.SE ) ? 2 : 1; } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override Poison PoisonImmune { get { return Poison.Lethal; } } public override int GetAngerSound() @@ -120,4 +121,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs b/Scripts/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs index d3087d76a..155618c3f 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles public class EnergyVortex : BaseCreature { public override bool DeleteCorpseOnDeath { get { return Summoned; } } - public override bool AlwaysMurderer{ get{ return true; } } // Or Llama vortices will appear gray. + public override bool AlwaysMurderer => true; // Or Llama vortices will appear gray. public override double DispelDifficulty { get { return 80.0; } } public override double DispelFocus { get { return 20.0; } } @@ -19,13 +19,13 @@ namespace Server.Mobiles return ( m.Int + m.Skills[SkillName.Magery].Value ) / Math.Max( GetDistanceToSqrt( m ), 1.0 ); } + public override string DefaultName => "an energy vortex"; + [Constructible] public EnergyVortex() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an energy vortex"; - - if( Core.SE && 0.002 > Utility.RandomDouble() ) // Per OSI FoF, it's a 1/500 chance. + if ( Core.SE && 0.002 > Utility.RandomDouble() ) // Per OSI FoF, it's a 1/500 chance. { // Llama vortex! Body = 0xDC; @@ -66,7 +66,7 @@ namespace Server.Mobiles ControlSlots = ( Core.SE ) ? 2 : 1; } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override Poison PoisonImmune { get { return Poison.Lethal; } } public override int GetAngerSound() @@ -129,4 +129,4 @@ namespace Server.Mobiles BaseSoundID = 0; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/FrostOoze.cs b/Scripts/Mobiles/Monsters/Misc/Melee/FrostOoze.cs index 576db669e..419394eb9 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/FrostOoze.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/FrostOoze.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a frost ooze corpse" )] public class FrostOoze : BaseCreature { + public override string DefaultName => "a frost ooze"; + [Constructible] public FrostOoze() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a frost ooze"; Body = 94; BaseSoundID = 456; @@ -61,4 +62,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs b/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs index f58363475..b2fdc3f39 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs @@ -9,14 +9,16 @@ namespace Server.Mobiles { private bool m_Stunning; - public override bool IsScaredOfScaryThings{ get{ return false; } } - public override bool IsScaryToPets{ get{ return true; } } + public override bool IsScaredOfScaryThings => false; + public override bool IsScaryToPets => true; - public override bool IsBondable{ get{ return false; } } + public override bool IsBondable => false; public override FoodType FavoriteFood { get { return FoodType.None; } } - public override bool CanBeDistracted { get { return false; } } + public override bool CanBeDistracted => false; + + public override string DefaultName => "a golem"; [Constructible] public Golem() : this( false, 1.0 ) @@ -26,7 +28,6 @@ namespace Server.Mobiles [Constructible] public Golem( bool summoned, double scalar ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.4, 0.8 ) { - Name = "a golem"; Body = 752; if ( summoned ) @@ -106,7 +107,7 @@ namespace Server.Mobiles } } - public override bool DeleteOnRelease{ get{ return true; } } + public override bool DeleteOnRelease => true; public override int GetAngerSound() { @@ -142,8 +143,8 @@ namespace Server.Mobiles return base.GetHurtSound(); } - public override bool AutoDispel{ get{ return !Controlled; } } - public override bool BleedImmune{ get{ return true; } } + public override bool AutoDispel => !Controlled; + public override bool BleedImmune => true; public override void OnGaveMeleeAttack( Mobile defender ) { @@ -210,8 +211,8 @@ namespace Server.Mobiles base.OnDamage( amount, from, willKill ); } - public override bool BardImmune{ get{ return !Core.AOS || Controlled; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BardImmune => !Core.AOS || Controlled; + public override Poison PoisonImmune => Poison.Lethal; public Golem( Serial serial ) : base( serial ) { @@ -229,4 +230,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs index 7c1dabe2f..cf72fb396 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs @@ -33,10 +33,11 @@ namespace Server.Mobiles get { return m_HasMetalChest; } } + public override string DefaultName => "a plague beast"; + [Constructible] public PlagueBeast() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a plague beast"; Body = 775; SetStr( 302, 500 ); @@ -107,8 +108,8 @@ namespace Server.Mobiles base.OnDamagedBySpell( caster ); } - public override bool AutoDispel{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool AutoDispel => true; + public override Poison PoisonImmune => Poison.Lethal; public override void OnGotMeleeAttack( Mobile attacker ) { diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs index 3a61c5619..83baea592 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs @@ -42,10 +42,11 @@ namespace Server.Mobiles private DecayTimer m_Timer; + public override string DefaultName => "a plague beast lord"; + [Constructible] public PlagueBeastLord() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a plague beast lord"; Body = 775; BaseSoundID = 679; SpeechHue = 0x3B2; @@ -99,7 +100,7 @@ namespace Server.Mobiles public override void OnDeath( Container c ) { base.OnDeath( c ); - + for ( int i = c.Items.Count - 1; i >= 0; i-- ) c.Items[ i ].Delete(); } @@ -204,10 +205,10 @@ namespace Server.Mobiles if ( m_OpenedBy == null && IsAccessibleTo( from ) ) { m_OpenedBy = from; - + if ( m_Timer == null ) m_Timer = new DecayTimer( this ); - + if ( !m_Timer.Running ) m_Timer.Start(); diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs index 8b9e192cf..d291994bc 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs @@ -32,7 +32,7 @@ namespace Server.Mobiles { } - public override bool AlwaysMurderer{ get{ return true; } } + public override bool AlwaysMurderer => true; public override void DisplayPaperdollTo(Mobile to) { @@ -62,12 +62,13 @@ namespace Server.Mobiles } } + public override string DefaultName => "a plague spawn"; + public PlagueSpawn( Mobile owner ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { m_Owner = owner; m_ExpireTime = DateTime.UtcNow + TimeSpan.FromMinutes( 1.0 ); - Name = "a plague spawn"; Hue = Utility.Random( 0x11, 15 ); switch ( Utility.Random( 12 ) ) @@ -146,4 +147,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/SandVortex.cs b/Scripts/Mobiles/Monsters/Misc/Melee/SandVortex.cs index d005af841..92df3416f 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/SandVortex.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/SandVortex.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a sand vortex corpse" )] public class SandVortex : BaseCreature { + public override string DefaultName => "a sand vortex"; + [Constructible] public SandVortex() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a sand vortex"; Body = 790; BaseSoundID = 263; @@ -108,4 +109,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/Slime.cs b/Scripts/Mobiles/Monsters/Misc/Melee/Slime.cs index bbe5d0ab4..ab5478de1 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/Slime.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/Slime.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a slimey corpse" )] public class Slime : BaseCreature { + public override string DefaultName => "a slime"; + [Constructible] public Slime() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a slime"; Body = 51; BaseSoundID = 456; @@ -51,8 +52,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems ); } - public override Poison PoisonImmune{ get{ return Poison.Lesser; } } - public override Poison HitPoison{ get{ return Poison.Lesser; } } + public override Poison PoisonImmune => Poison.Lesser; + public override Poison HitPoison => Poison.Lesser; public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish | FoodType.FruitsAndVegies | FoodType.GrainsAndHay | FoodType.Eggs; } } public Slime( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs index 4d61b3662..dc18d0681 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs @@ -7,6 +7,8 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class AgapiteElemental : BaseCreature { + public override string DefaultName{ get { return "an agapite elemental"; } } + [Constructible] public AgapiteElemental() : this( 2 ) { @@ -15,7 +17,6 @@ namespace Server.Mobiles [Constructible] public AgapiteElemental( int oreAmount ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an agapite elemental"; Body = 107; BaseSoundID = 268; @@ -55,8 +56,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool BleedImmune{ get{ return true; } } - public override bool AutoDispel{ get{ return true; } } + public override bool BleedImmune => true; + public override bool AutoDispel => true; public override int TreasureMapLevel{ get{ return 1; } } public AgapiteElemental( Serial serial ) : base( serial ) @@ -75,4 +76,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs index d5527c99c..391cd10a1 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs @@ -7,6 +7,8 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class BronzeElemental : BaseCreature { + public override string DefaultName { get { return "a bronze elemental"; } } + [Constructible] public BronzeElemental() : this( 2 ) { @@ -16,7 +18,6 @@ namespace Server.Mobiles public BronzeElemental( int oreAmount ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { // TODO: Gas attack - Name = "a bronze elemental"; Body = 108; BaseSoundID = 268; @@ -57,8 +58,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool BleedImmune{ get{ return true; } } - public override bool AutoDispel{ get{ return true; } } + public override bool BleedImmune => true; + public override bool AutoDispel => true; public override int TreasureMapLevel{ get{ return 1; } } public BronzeElemental( Serial serial ) : base( serial ) @@ -77,4 +78,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/CopperElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/CopperElemental.cs index a5282d94e..05ad8396f 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/CopperElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/CopperElemental.cs @@ -7,6 +7,8 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class CopperElemental : BaseCreature { + public override string DefaultName { get { return "a copper elemental"; } } + [Constructible] public CopperElemental() : this( 2 ) { @@ -15,7 +17,6 @@ namespace Server.Mobiles [Constructible] public CopperElemental( int oreAmount ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a copper elemental"; Body = 109; BaseSoundID = 268; @@ -55,8 +56,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool BleedImmune{ get{ return true; } } - public override bool AutoDispel{ get{ return true; } } + public override bool BleedImmune => true; + public override bool AutoDispel => true; public override int TreasureMapLevel{ get{ return 1; } } public override void CheckReflect( Mobile caster, ref bool reflect ) @@ -80,4 +81,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs index 097e3163c..9dcde6386 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs @@ -7,6 +7,8 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class DullCopperElemental : BaseCreature { + public override string DefaultName => "a dull copper elemental"; + [Constructible] public DullCopperElemental() : this( 2 ) { @@ -15,7 +17,6 @@ namespace Server.Mobiles [Constructible] public DullCopperElemental( int oreAmount ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a dull copper elemental"; Body = 110; BaseSoundID = 268; @@ -55,8 +56,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool AutoDispel{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } + public override bool AutoDispel => true; + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 1; } } public DullCopperElemental( Serial serial ) : base( serial ) @@ -75,4 +76,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs index d0d4fa2b4..6f9583603 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs @@ -7,6 +7,8 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class GoldenElemental : BaseCreature { + public override string DefaultName => "a golden elemental"; + [Constructible] public GoldenElemental() : this( 2 ) { @@ -15,7 +17,6 @@ namespace Server.Mobiles [Constructible] public GoldenElemental( int oreAmount ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a golden elemental"; Body = 166; BaseSoundID = 268; @@ -55,8 +56,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool AutoDispel{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } + public override bool AutoDispel => true; + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 1; } } public GoldenElemental( Serial serial ) : base( serial ) @@ -75,4 +76,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs index 9551c4fd6..3d09b6264 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs @@ -7,6 +7,8 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class ShadowIronElemental : BaseCreature { + public override string DefaultName => "a shadow iron elemental"; + [Constructible] public ShadowIronElemental() : this( 2 ) { @@ -15,7 +17,6 @@ namespace Server.Mobiles [Constructible] public ShadowIronElemental( int oreAmount ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a shadow iron elemental"; Body = 111; BaseSoundID = 268; @@ -55,11 +56,11 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool AutoDispel{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } + public override bool AutoDispel => true; + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 1; } } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } - public override bool BreathImmune{ get{ return true; } } + public override Poison PoisonImmune => Poison.Deadly; + public override bool BreathImmune => true; public override void AlterMeleeDamageFrom( Mobile from, ref int damage ) { @@ -76,7 +77,7 @@ namespace Server.Mobiles { scalar = 0.0; // Immune to magic } - + public override void AlterSpellDamageFrom( Mobile from, ref int damage ) { damage = 0; @@ -98,4 +99,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs index 390dc1132..e0b7ef6a2 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs @@ -7,6 +7,8 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class ValoriteElemental : BaseCreature { + public override string DefaultName => "a valorite elemental"; + [Constructible] public ValoriteElemental() : this( 2 ) { @@ -16,7 +18,6 @@ namespace Server.Mobiles public ValoriteElemental( int oreAmount ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { // TODO: Gas attack - Name = "a valorite elemental"; Body = 112; BaseSoundID = 268; @@ -59,8 +60,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 4 ); } - public override bool AutoDispel{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } + public override bool AutoDispel => true; + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 1; } } public override void AlterMeleeDamageFrom( Mobile from, ref int damage ) @@ -95,4 +96,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs index f00df50f7..a4c322f65 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs @@ -7,6 +7,8 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class VeriteElemental : BaseCreature { + public override string DefaultName => "a verite elemental"; + [Constructible] public VeriteElemental() : this( 2 ) { @@ -15,7 +17,6 @@ namespace Server.Mobiles [Constructible] public VeriteElemental( int oreAmount ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a verite elemental"; Body = 113; BaseSoundID = 268; @@ -56,8 +57,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool AutoDispel{ get{ return true; } } - public override bool BleedImmune{ get{ return true; } } + public override bool AutoDispel => true; + public override bool BleedImmune => true; public override int TreasureMapLevel{ get{ return 1; } } public VeriteElemental( Serial serial ) : base( serial ) @@ -76,4 +77,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Plant/Magic/Reaper.cs b/Scripts/Mobiles/Monsters/Plant/Magic/Reaper.cs index 7e3168a10..c846d5bc8 100644 --- a/Scripts/Mobiles/Monsters/Plant/Magic/Reaper.cs +++ b/Scripts/Mobiles/Monsters/Plant/Magic/Reaper.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a reapers corpse" )] public class Reaper : BaseCreature { + public override string DefaultName => "a reaper"; + [Constructible] public Reaper() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a reaper"; Body = 47; BaseSoundID = 442; @@ -52,9 +53,9 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override Poison PoisonImmune{ get{ return Poison.Greater; } } + public override Poison PoisonImmune => Poison.Greater; public override int TreasureMapLevel{ get{ return 2; } } - public override bool DisallowAllMoves{ get{ return true; } } + public override bool DisallowAllMoves => true; public Reaper( Serial serial ) : base( serial ) { @@ -72,4 +73,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs b/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs index f1f563c47..fdc58c8e4 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a plant corpse" )] public class BogThing : BaseCreature { + public override string DefaultName { get { return "a bog thing"; } } + [Constructible] public BogThing() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.6, 1.2 ) { - Name = "a bog thing"; Body = 780; SetStr( 801, 900 ); @@ -55,8 +56,8 @@ namespace Server.Mobiles AddLoot( LootPack.Average, 2 ); } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BardImmune => !Core.AOS; + public override Poison PoisonImmune => Poison.Lethal; public BogThing( Serial serial ) : base( serial ) { @@ -107,7 +108,7 @@ namespace Server.Mobiles public void EatBoglings() { ArrayList toEat = new ArrayList(); - + foreach ( Mobile m in this.GetMobilesInRange( 2 ) ) { if ( m is Bogling ) @@ -141,4 +142,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/Bogling.cs b/Scripts/Mobiles/Monsters/Plant/Melee/Bogling.cs index 2fd8ff9c5..7e3084df2 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/Bogling.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/Bogling.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a plant corpse" )] public class Bogling : BaseCreature { + public override string DefaultName { get { return "a bogling"; } } + [Constructible] public Bogling() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a bogling"; Body = 779; BaseSoundID = 422; diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/Corpser.cs b/Scripts/Mobiles/Monsters/Plant/Melee/Corpser.cs index 406dbc18c..363cb8369 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/Corpser.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/Corpser.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a corpser corpse" )] public class Corpser : BaseCreature { + public override string DefaultName { get { return "a corpser"; } } + [Constructible] public Corpser() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a corpser"; Body = 8; BaseSoundID = 684; @@ -54,8 +55,8 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override Poison PoisonImmune{ get{ return Poison.Lesser; } } - public override bool DisallowAllMoves{ get{ return true; } } + public override Poison PoisonImmune => Poison.Lesser; + public override bool DisallowAllMoves => true; public Corpser( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/Quagmire.cs b/Scripts/Mobiles/Monsters/Plant/Melee/Quagmire.cs index 6f06e2e78..4b0729627 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/Quagmire.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/Quagmire.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a quagmire corpse" )] public class Quagmire : BaseCreature { + public override string DefaultName => "a quagmire"; + [Constructible] public Quagmire() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.4, 0.8 ) { - Name = "a quagmire"; Body = 789; BaseSoundID = 352; @@ -50,8 +51,8 @@ namespace Server.Mobiles return 353; } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override Poison HitPoison{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; + public override Poison HitPoison => Poison.Lethal; public override double HitPoisonChance{ get{ return 0.1; } } public Quagmire( Serial serial ) : base( serial ) @@ -73,4 +74,4 @@ namespace Server.Mobiles BaseSoundID = 352; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/SwampTentacle.cs b/Scripts/Mobiles/Monsters/Plant/Melee/SwampTentacle.cs index b2a2898d8..5fa3b1183 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/SwampTentacle.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/SwampTentacle.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a swamp tentacle corpse" )] public class SwampTentacle : BaseCreature { + public override string DefaultName => "a swamp tentacle"; + [Constructible] public SwampTentacle() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a swamp tentacle"; Body = 66; BaseSoundID = 352; @@ -48,7 +49,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override Poison PoisonImmune{ get{ return Poison.Greater; } } + public override Poison PoisonImmune => Poison.Greater; public SwampTentacle( Serial serial ) : base( serial ) { @@ -66,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/WhippingVine.cs b/Scripts/Mobiles/Monsters/Plant/Melee/WhippingVine.cs index 81f7e8758..e36d848dc 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/WhippingVine.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/WhippingVine.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a whipping vine corpse" )] public class WhippingVine : BaseCreature { + public override string DefaultName => "a whipping vine"; + [Constructible] public WhippingVine() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a whipping vine"; Body = 8; Hue = 0x851; BaseSoundID = 352; @@ -49,8 +50,8 @@ namespace Server.Mobiles PackItem( new Vines() ); } - public override bool BardImmune{ get{ return !Core.AOS; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool BardImmune => !Core.AOS; + public override Poison PoisonImmune => Poison.Lethal; public WhippingVine( Serial serial ) : base( serial ) { @@ -68,4 +69,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs index 82247018e..1dabd1702 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a dragon corpse" )] public class AncientWyrm : BaseCreature { + public override string DefaultName { get { return "an ancient wyrm"; } } + [Constructible] public AncientWyrm () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an ancient wyrm"; Body = 46; BaseSoundID = 362; @@ -60,18 +61,18 @@ namespace Server.Mobiles return 0x2D1; } - public override bool ReacquireOnMovement{ get{ return true; } } - public override bool HasBreath{ get{ return true; } } // fire breath enabled - public override bool AutoDispel{ get{ return true; } } + public override bool ReacquireOnMovement => true; + public override bool HasBreath => true; // fire breath enabled + public override bool AutoDispel => true; public override HideType HideType{ get{ return HideType.Barbed; } } public override int Hides{ get{ return 40; } } public override int Meat{ get{ return 19; } } public override int Scales{ get{ return 12; } } public override ScaleType ScaleType{ get{ return (ScaleType)Utility.Random( 4 ); } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } - public override Poison HitPoison{ get{ return Utility.RandomBool() ? Poison.Lesser : Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; + public override Poison HitPoison => Utility.RandomBool() ? Poison.Lesser : Poison.Regular; public override int TreasureMapLevel{ get{ return 5; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public AncientWyrm( Serial serial ) : base( serial ) { @@ -89,4 +90,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs index 22c9406a9..0b3929de5 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a deep sea serpents corpse" )] public class DeepSeaSerpent : BaseCreature { + public override string DefaultName { get { return "a deep sea serpent"; } } + [Constructible] public DeepSeaSerpent() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a deep sea serpent"; Body = 150; BaseSoundID = 447; @@ -56,7 +57,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool HasBreath{ get{ return true; } } + public override bool HasBreath => true; public override int Meat{ get{ return 1; } } public override int Scales{ get{ return 8; } } public override ScaleType ScaleType{ get{ return ScaleType.Blue; } } @@ -77,4 +78,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs index 48e138e47..fd1d027a8 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a dragon corpse" )] public class Dragon : BaseCreature { + public override string DefaultName => "a dragon"; + [Constructible] public Dragon () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a dragon"; Body = Utility.RandomList( 12, 59 ); BaseSoundID = 362; @@ -52,9 +53,9 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 8 ); } - public override bool ReacquireOnMovement{ get{ return !Controlled; } } - public override bool HasBreath{ get{ return true; } } // fire breath enabled - public override bool AutoDispel{ get{ return !Controlled; } } + public override bool ReacquireOnMovement => !Controlled; + public override bool HasBreath => true; // fire breath enabled + public override bool AutoDispel => !Controlled; public override int TreasureMapLevel{ get{ return 4; } } public override int Meat{ get{ return 19; } } public override int Hides{ get{ return 20; } } @@ -62,8 +63,8 @@ namespace Server.Mobiles 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 bool CanAngerOnTame { get { return true; } } - public override bool CanFly { get { return true; } } + public override bool CanAngerOnTame => true; + public override bool CanFly => true; public Dragon( Serial serial ) : base( serial ) { @@ -81,4 +82,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs index 78e07f392..424409b87 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs @@ -16,6 +16,8 @@ namespace Server.Mobiles set{ m_Fisher = value; } } + public override string DefaultName => "a leviathan"; + [Constructible] public Leviathan() : this( null ) { @@ -27,7 +29,6 @@ namespace Server.Mobiles m_Fisher = fisher; // May not be OSI accurate; mostly copied from krakens - Name = "a leviathan"; Body = 77; BaseSoundID = 353; @@ -76,7 +77,7 @@ namespace Server.Mobiles PackItem( rope ); } - public override bool HasBreath{ get{ return true; } } + public override bool HasBreath => true; public override int BreathPhysicalDamage{ get{ return 70; } } // TODO: Verify damage type public override int BreathColdDamage{ get{ return 30; } } public override int BreathFireDamage{ get{ return 0; } } @@ -179,4 +180,4 @@ namespace Server.Mobiles m_Fisher = null; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs index da1e06c9e..b98bfed3e 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "an ophidian corpse" )] public class OphidianMatriarch : BaseCreature { + public override string DefaultName => "an ophidian matriarch"; + [Constructible] public OphidianMatriarch() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an ophidian matriarch"; Body = 87; BaseSoundID = 644; @@ -50,7 +51,7 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override Poison PoisonImmune{ get{ return Poison.Greater; } } + public override Poison PoisonImmune => Poison.Greater; public override int TreasureMapLevel{ get{ return 4; } } public override OppositionGroup OppositionGroup @@ -74,4 +75,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs index 9907b1ac0..4fff4fce8 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Seaserpant" )] public class SeaSerpent : BaseCreature { + public override string DefaultName => "a sea serpent"; + [Constructible] public SeaSerpent() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a sea serpent"; Body = 150; BaseSoundID = 447; @@ -59,7 +60,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool HasBreath{ get{ return true; } } + public override bool HasBreath => true; public override int TreasureMapLevel{ get{ return 2; } } public override int Hides{ get{ return 10; } } @@ -83,4 +84,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs index 28a25f772..3174b672d 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a dragon corpse" )] public class SerpentineDragon : BaseCreature { + public override string DefaultName => "a serpentine dragon"; + [Constructible] public SerpentineDragon() : base( AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4 ) { - Name = "a serpentine dragon"; Body = 103; BaseSoundID = 362; @@ -78,11 +79,11 @@ namespace Server.Mobiles return 0x2C3; } - public override bool ReacquireOnMovement{ get{ return true; } } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool ReacquireOnMovement => true; + public override bool HasBreath => true; // fire breath enabled public override double BonusPetDamageScalar{ get{ return (Core.SE) ? 3.0 : 1.0; } } - public override bool AutoDispel{ get{ return true; } } + public override bool AutoDispel => true; public override HideType HideType{ get{ return HideType.Barbed; } } public override int Hides{ get{ return 20; } } public override int Meat{ get{ return 19; } } @@ -123,4 +124,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs index 383854051..36f6e97a1 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a shadow wyrm corpse" )] public class ShadowWyrm : BaseCreature { + public override string DefaultName => "a shadow wyrm"; + [Constructible] public ShadowWyrm() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a shadow wyrm"; Body = 106; BaseSoundID = 362; @@ -60,11 +61,11 @@ namespace Server.Mobiles return 0x2D1; } - public override bool ReacquireOnMovement{ get{ return true; } } - public override bool HasBreath{ get{ return true; } } // fire breath enabled - public override bool AutoDispel{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } - public override Poison HitPoison{ get{ return Poison.Deadly; } } + public override bool ReacquireOnMovement => true; + public override bool HasBreath => true; // fire breath enabled + public override bool AutoDispel => true; + public override Poison PoisonImmune => Poison.Deadly; + public override Poison HitPoison => Poison.Deadly; public override int TreasureMapLevel{ get{ return 5; } } public override int Meat{ get{ return 19; } } @@ -72,7 +73,7 @@ namespace Server.Mobiles public override int Scales{ get{ return 10; } } public override ScaleType ScaleType{ get{ return ScaleType.Black; } } public override HideType HideType{ get{ return HideType.Barbed; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public ShadowWyrm( Serial serial ) : base( serial ) { @@ -90,4 +91,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs index 5065cc0c3..b3816d8e1 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a skeletal dragon corpse" )] public class SkeletalDragon : BaseCreature { + public override string DefaultName => "a skeletal dragon"; + [Constructible] public SkeletalDragon () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a skeletal dragon"; Body = 104; BaseSoundID = 0x488; @@ -51,17 +52,17 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 5 ); } - public override bool ReacquireOnMovement{ get{ return true; } } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool ReacquireOnMovement => true; + public override bool HasBreath => true; // fire breath enabled public override int BreathFireDamage{ get{ return 0; } } public override int BreathColdDamage{ get{ return 100; } } public override int BreathEffectHue{ get{ return 0x480; } } public override double BonusPetDamageScalar{ get{ return (Core.SE)? 3.0 : 1.0; } } // TODO: Undead summoning? - public override bool AutoDispel{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override bool BleedImmune{ get{ return true; } } + public override bool AutoDispel => true; + public override Poison PoisonImmune => Poison.Lethal; + public override bool BleedImmune => true; public override int Meat{ get{ return 19; } } // where's it hiding these? :) public override int Hides{ get{ return 20; } } public override HideType HideType{ get{ return HideType.Barbed; } } @@ -82,4 +83,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs index 8345922e3..24d31b408 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs @@ -7,11 +7,12 @@ namespace Server.Mobiles [CorpseName( "a white wyrm corpse" )] public class WhiteWyrm : BaseCreature { + public override string DefaultName => "a white wyrm"; + [Constructible] public WhiteWyrm() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Body = Utility.RandomBool() ? 180 : 49; - Name = "a white wyrm"; BaseSoundID = 362; SetStr( 721, 760 ); @@ -54,7 +55,7 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, Utility.Random( 1, 5 ) ); } - public override bool ReacquireOnMovement{ get{ return true; } } + public override bool ReacquireOnMovement => true; public override int TreasureMapLevel{ get{ return 4; } } public override int Meat{ get{ return 19; } } public override int Hides{ get{ return 20; } } @@ -62,8 +63,8 @@ namespace Server.Mobiles public override int Scales{ get{ return 9; } } public override ScaleType ScaleType{ get{ return ScaleType.White; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Gold; } } - public override bool CanAngerOnTame { get { return true; } } - public override bool CanFly { get { return true; } } + public override bool CanAngerOnTame => true; + public override bool CanFly => true; public WhiteWyrm( Serial serial ) : base( serial ) { @@ -81,4 +82,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs index fd9a7ed32..a1d57b18b 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a drake corpse" )] public class Drake : BaseCreature { + public override string DefaultName => "a drake"; + [Constructible] public Drake () : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a drake"; Body = Utility.RandomList( 60, 61 ); BaseSoundID = 362; @@ -53,8 +54,8 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override bool ReacquireOnMovement{ get{ return true; } } - public override bool HasBreath{ get{ return true; } } // fire breath enabled + public override bool ReacquireOnMovement => true; + public override bool HasBreath => true; // fire breath enabled public override int TreasureMapLevel{ get{ return 2; } } public override int Meat{ get{ return 10; } } public override int Hides{ get{ return 20; } } @@ -62,7 +63,7 @@ namespace Server.Mobiles public override int Scales{ get{ return 2; } } public override ScaleType ScaleType{ get{ return ( Body == 60 ? ScaleType.Yellow : ScaleType.Red ); } } public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public Drake( Serial serial ) : base( serial ) { @@ -80,4 +81,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs index 3b7121f95..5299f9821 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs @@ -8,10 +8,10 @@ namespace Server.Mobiles [CorpseName( "a harpy corpse" )] public class Harpy : BaseCreature { + public override string DefaultName => "a harpy"; [Constructible] public Harpy() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a harpy"; Body = 30; BaseSoundID = 402; @@ -71,11 +71,11 @@ namespace Server.Mobiles return 918; } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int Meat{ get{ return 4; } } public override MeatType MeatType{ get{ return MeatType.Bird; } } public override int Feathers{ get{ return 50; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public Harpy( Serial serial ) : base( serial ) { @@ -93,4 +93,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Kraken.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Kraken.cs index 3f1086c59..8e4e3c232 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Kraken.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Kraken.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a krakens corpse" )] public class Kraken : BaseCreature { + public override string DefaultName => "a kraken"; + [Constructible] public Kraken() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a kraken"; Body = 77; BaseSoundID = 353; diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Lizardman.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Lizardman.cs index 0c004be05..e2688898d 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Lizardman.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Lizardman.cs @@ -49,7 +49,7 @@ namespace Server.Mobiles // TODO: weapon } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int Meat{ get{ return 1; } } public override int Hides{ get{ return 12; } } public override HideType HideType{ get{ return HideType.Spined; } } @@ -70,4 +70,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs index bab3e3f1f..e6b0e8335 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs @@ -59,8 +59,8 @@ namespace Server.Mobiles public override int Meat{ get{ return 2; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override Poison HitPoison{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; + public override Poison HitPoison => Poison.Lethal; public override int TreasureMapLevel{ get{ return 3; } } public override OppositionGroup OppositionGroup @@ -84,4 +84,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Scorpion.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Scorpion.cs index ee6487045..01eeff370 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Scorpion.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Scorpion.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a scorpion corpse" )] public class Scorpion : BaseCreature { + public override string DefaultName => "a scorpion"; + [Constructible] public Scorpion() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a scorpion"; Body = 48; BaseSoundID = 397; @@ -58,8 +59,8 @@ namespace Server.Mobiles public override int Meat{ get{ return 1; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } public override PackInstinct PackInstinct{ get{ return PackInstinct.Arachnid; } } - public override Poison PoisonImmune{ get{ return Poison.Greater; } } - public override Poison HitPoison{ get{ return (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); } } + public override Poison PoisonImmune => Poison.Greater; + public override Poison HitPoison => (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); public Scorpion( Serial serial ) : base( serial ) { @@ -77,4 +78,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs index bbb4dbc9e..41415eb2e 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a stone harpy corpse" )] public class StoneHarpy : BaseCreature { + public override string DefaultName => "a stone harpy"; + [Constructible] public StoneHarpy() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a stone harpy"; Body = 73; BaseSoundID = 402; @@ -76,7 +77,7 @@ namespace Server.Mobiles public override int Meat{ get{ return 1; } } public override int Feathers{ get{ return 50; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public StoneHarpy( Serial serial ) : base( serial ) { @@ -94,4 +95,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs index 8b2d1d45c..e5bb20d50 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles [CorpseName( "a wyvern corpse" )] public class Wyvern : BaseCreature { + public override string DefaultName => "a wyvern"; + [Constructible] public Wyvern () : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a wyvern"; Body = 62; BaseSoundID = 362; @@ -50,16 +51,16 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls ); } - public override bool ReacquireOnMovement{ get{ return true; } } + public override bool ReacquireOnMovement => true; - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } - public override Poison HitPoison{ get{ return Poison.Deadly; } } + public override Poison PoisonImmune => Poison.Deadly; + public override Poison HitPoison => Poison.Deadly; public override int TreasureMapLevel{ get{ return 2; } } public override int Meat{ get{ return 10; } } public override int Hides{ get{ return 20; } } public override HideType HideType{ get{ return HideType.Horned; } } - public override bool CanFly { get { return true; } } + public override bool CanFly => true; public override int GetAttackSound() { @@ -102,4 +103,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/BakeKitsune.cs b/Scripts/Mobiles/Monsters/SE/BakeKitsune.cs index 47b184927..e2db96a41 100644 --- a/Scripts/Mobiles/Monsters/SE/BakeKitsune.cs +++ b/Scripts/Mobiles/Monsters/SE/BakeKitsune.cs @@ -7,11 +7,11 @@ namespace Server.Mobiles [CorpseName( "a bake kitsune corpse" )] public class BakeKitsune : BaseCreature { + public override string DefaultName{ get { return "a bake kitsune"; } } [Constructible] public BakeKitsune() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a bake kitsune"; Body = 246; SetStr( 171, 220 ); @@ -60,9 +60,9 @@ namespace Server.Mobiles public override int Hides{ get{ return 10; } } public override HideType HideType{ get{ return HideType.Barbed; } } public override FoodType FavoriteFood{ get{ return FoodType.Fish; } } - public override bool ShowFameTitle{ get{ return false; } } - public override bool ClickTitle{ get{ return false; } } - public override bool PropertyTitle{ get{ return false; } } + public override bool ShowFameTitle => false; + public override bool ClickTitle => false; + public override bool PropertyTitle => false; public override void OnCombatantChange() { @@ -126,8 +126,8 @@ namespace Server.Mobiles { if ( !IsBodyMod ) return; - - Name = "a bake kitsune"; + + Name = null; Title = null; BodyMod = 0; Hue = 0; @@ -164,7 +164,7 @@ namespace Server.Mobiles * Damage: 2 hps per second for 5 seconds * End cliloc: 1070824 */ - + ExpireTimer timer = (ExpireTimer)m_Table[defender]; if ( timer != null ) @@ -182,7 +182,7 @@ namespace Server.Mobiles } private static Hashtable m_Table = new Hashtable(); - + private class ExpireTimer : Timer { private Mobile m_Mobile; @@ -221,7 +221,7 @@ namespace Server.Mobiles } } } - + public override int GetAngerSound() { return 0x4DE; diff --git a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs index fa4332a56..018d7d8b0 100644 --- a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs +++ b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs @@ -9,14 +9,13 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.DeathWatchBeetle" )] public class DeathwatchBeetle : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.CrushingBlow; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow; + + public override string DefaultName { get { return "a deathwatch beetle"; } } + [Constructible] public DeathwatchBeetle() : base( AIType.AI_Melee, Core.ML ? FightMode.Aggressor : FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a deathwatch beetle"; Body = 242; SetStr( 136, 160 ); diff --git a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs index 0c9de0970..9e3fcfcea 100644 --- a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs +++ b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.DeathWatchBeetleHatchling" )] public class DeathwatchBeetleHatchling : BaseCreature { + public override string DefaultName { get { return "a deathwatch beetle hatchling"; } } + [Constructible] public DeathwatchBeetleHatchling() : base( AIType.AI_Melee, Core.ML ? FightMode.Aggressor : FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a deathwatch beetle hatchling"; Body = 242; SetStr( 26, 50 ); diff --git a/Scripts/Mobiles/Monsters/SE/EliteNinja.cs b/Scripts/Mobiles/Monsters/SE/EliteNinja.cs index 90f14999a..3d2aea00f 100644 --- a/Scripts/Mobiles/Monsters/SE/EliteNinja.cs +++ b/Scripts/Mobiles/Monsters/SE/EliteNinja.cs @@ -9,16 +9,17 @@ namespace Server.Mobiles { public class EliteNinja : BaseCreature { - public override bool ClickTitle{ get{ return false; } } + public override bool ClickTitle => false; + public override string DefaultName => "an elite ninja"; [Constructible] public EliteNinja() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { SpeechHue = Utility.RandomDyedHue(); Hue = Utility.RandomSkinHue(); - Name = "an elite ninja"; + Female = Utility.RandomBool(); - Body = ( this.Female = Utility.RandomBool() ) ? 0x191 : 0x190; + Body = Female ? 0x191 : 0x190; SetHits( 251, 350 ); @@ -52,21 +53,21 @@ namespace Server.Mobiles Fame = 8500; Karma = -8500; - /* TODO: + /* TODO: Uses Smokebombs Hides Stealths Can use Ninjitsu Abilities Can change weapons during a fight */ - + AddItem( new NinjaTabi() ); AddItem( new LeatherNinjaJacket()); AddItem( new LeatherNinjaHood()); AddItem( new LeatherNinjaPants()); AddItem( new LeatherNinjaMitts()); - + if( Utility.RandomDouble() < 0.33 ) AddItem( new SmokeBomb() ); @@ -91,7 +92,7 @@ namespace Server.Mobiles c.DropItem( new BookOfNinjitsu() ); } - public override bool BardImmune{ get{ return true; } } + public override bool BardImmune => true; public override void GenerateLoot() { @@ -99,8 +100,8 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); AddLoot( LootPack.Gems, 2 ); } - - public override bool AlwaysMurderer{ get{ return true; } } + + public override bool AlwaysMurderer => true; public EliteNinja( Serial serial ) : base( serial ) { @@ -120,4 +121,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/FanDancer.cs b/Scripts/Mobiles/Monsters/SE/FanDancer.cs index 3634ca628..6e5d9b32b 100644 --- a/Scripts/Mobiles/Monsters/SE/FanDancer.cs +++ b/Scripts/Mobiles/Monsters/SE/FanDancer.cs @@ -9,10 +9,10 @@ namespace Server.Mobiles [CorpseName( "a fan dancer corpse" )] public class FanDancer : BaseCreature { + public override string DefaultName => "a fan dancer"; [Constructible] public FanDancer() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a fan dancer"; Body = 247; BaseSoundID = 0x372; @@ -42,25 +42,25 @@ namespace Server.Mobiles Fame = 9000; Karma = -9000; - + if ( Utility.RandomDouble() < .33 ) PackItem( Engines.Plants.Seed.RandomBonsaiSeed() ); - + AddItem( new Tessen() ); - + if ( 0.02 >= Utility.RandomDouble() ) PackItem( new OrigamiPaper() ); } - - + + public override void GenerateLoot() { AddLoot( LootPack.FilthyRich ); AddLoot( LootPack.Rich ); AddLoot( LootPack.Gems, 2 ); } - - public override bool Uncalmable{ get{ return true; } } + + public override bool Uncalmable => true; /* TODO: Repel Magic * 10% chance of repelling a melee attack (why did they call it repel magic anyway?) @@ -127,7 +127,7 @@ namespace Server.Mobiles //AOS.Damage( defender, this, Utility.RandomMinMax( 35, 45 ), 0, 100, 0, 0, 0 ); defender.AddResistanceMod( mod ); - + ExpireTimer timer = new ExpireTimer( defender, mod, TimeSpan.FromSeconds( 10.0 ) ); timer.Start(); m_Table[defender] = timer; @@ -180,4 +180,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/FireBeetle.cs b/Scripts/Mobiles/Monsters/SE/FireBeetle.cs index fc07e802c..d129aec24 100644 --- a/Scripts/Mobiles/Monsters/SE/FireBeetle.cs +++ b/Scripts/Mobiles/Monsters/SE/FireBeetle.cs @@ -8,10 +8,10 @@ namespace Server.Mobiles [Server.Engines.Craft.Forge] public class FireBeetle : BaseMount { - public override bool SubdueBeforeTame{ get{ return true; } } // Must be beaten into submission - public override bool StatLossAfterTame{ get{ return true; } } + public override bool SubdueBeforeTame => true; // Must be beaten into submission + public override bool StatLossAfterTame => true; public virtual double BoostedSpeed{ get{ return 0.1; } } - public override bool ReduceSpeedWithDamage{ get{ return false; } } + public override bool ReduceSpeedWithDamage => false; [Constructible] public FireBeetle() : base( "a fire beetle", 0xA9, 0x3E95, AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -122,4 +122,4 @@ namespace Server.Mobiles Hue = 0x489; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/Kappa.cs b/Scripts/Mobiles/Monsters/SE/Kappa.cs index 84b35663c..21632ee73 100644 --- a/Scripts/Mobiles/Monsters/SE/Kappa.cs +++ b/Scripts/Mobiles/Monsters/SE/Kappa.cs @@ -9,11 +9,11 @@ namespace Server.Mobiles [CorpseName( "a kappa corpse" )] public class Kappa : BaseCreature { + public override string DefaultName => "a kappa"; [Constructible] public Kappa() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a kappa"; Body = 240; SetStr( 186, 230 ); @@ -60,7 +60,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); AddLoot( LootPack.Average ); } - + public override int GetAngerSound() { return 0x50B; @@ -151,13 +151,13 @@ namespace Server.Mobiles if ( from != null && from.Map != null ) { int amt=0; - Mobile target = this; + Mobile target = this; int rand = Utility.Random( 1, 100 ); if ( willKill ) { amt = ((( rand % 5 ) >> 2 ) + 3); - } - if ( ( Hits < 100 ) && ( rand < 21 ) ) + } + if ( ( Hits < 100 ) && ( rand < 21 ) ) { target = ( rand % 2 ) < 1 ? this : from; amt++; @@ -165,7 +165,7 @@ namespace Server.Mobiles if ( amt > 0 ) { SpillAcid( target, amt ); - from.SendLocalizedMessage( 1070820 ); + from.SendLocalizedMessage( 1070820 ); if ( Mana > 14) Mana -= 15; amt ^= amt; diff --git a/Scripts/Mobiles/Monsters/SE/KazeKemono.cs b/Scripts/Mobiles/Monsters/SE/KazeKemono.cs index fb8215152..f40a40485 100644 --- a/Scripts/Mobiles/Monsters/SE/KazeKemono.cs +++ b/Scripts/Mobiles/Monsters/SE/KazeKemono.cs @@ -8,12 +8,12 @@ namespace Server.Mobiles [CorpseName( "a kaze kemono corpse" )] public class KazeKemono : BaseCreature { + public override string DefaultName => "a kaze kemono"; [Constructible] public KazeKemono() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a kaze kemono"; Body = 196; BaseSoundID = 655; @@ -52,7 +52,7 @@ namespace Server.Mobiles AddLoot( LootPack.Rich, 3 ); } - public override bool BleedImmune { get { return true; } } + public override bool BleedImmune => true; public override void OnGaveMeleeAttack( Mobile defender ) { diff --git a/Scripts/Mobiles/Monsters/SE/LadyOfTheSnow.cs b/Scripts/Mobiles/Monsters/SE/LadyOfTheSnow.cs index 5a2a49c82..e25a61a91 100644 --- a/Scripts/Mobiles/Monsters/SE/LadyOfTheSnow.cs +++ b/Scripts/Mobiles/Monsters/SE/LadyOfTheSnow.cs @@ -8,11 +8,12 @@ namespace Server.Mobiles [CorpseName( "a lady of the snow corpse" )] public class LadyOfTheSnow : BaseCreature { + public override string DefaultName => "a lady of the snow"; + [Constructible] public LadyOfTheSnow() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a lady of the snow"; Body = 252; BaseSoundID = 0x482; @@ -62,8 +63,8 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override bool BleedImmune { get { return true; } } - public override bool CanRummageCorpses { get { return true; } } + public override bool BleedImmune => true; + public override bool CanRummageCorpses => true; public override int TreasureMapLevel { get { return 4; } } // TODO: Snowball @@ -159,4 +160,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/Oni.cs b/Scripts/Mobiles/Monsters/SE/Oni.cs index 4db888961..bcc6e10fb 100644 --- a/Scripts/Mobiles/Monsters/SE/Oni.cs +++ b/Scripts/Mobiles/Monsters/SE/Oni.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "an oni corpse" )] public class Oni : BaseCreature { + public override string DefaultName => "an oni"; + [Constructible] public Oni() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an oni"; Body = 241; SetStr( 801, 910 ); @@ -78,7 +79,7 @@ namespace Server.Mobiles AddLoot( LootPack.FilthyRich, 3 ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 4; } } /* TODO: Angry Fire diff --git a/Scripts/Mobiles/Monsters/SE/RaiJu.cs b/Scripts/Mobiles/Monsters/SE/RaiJu.cs index 1d652f6ae..57aafc487 100644 --- a/Scripts/Mobiles/Monsters/SE/RaiJu.cs +++ b/Scripts/Mobiles/Monsters/SE/RaiJu.cs @@ -8,10 +8,11 @@ namespace Server.Mobiles [CorpseName( "a rai-ju corpse" )] public class RaiJu : BaseCreature { + public override string DefaultName => "a Rai-Ju"; + [Constructible] public RaiJu() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a Rai-Ju"; Body = 199; BaseSoundID = 0x346; @@ -39,7 +40,7 @@ namespace Server.Mobiles SetSkill( SkillName.Tactics, 55.1, 65.0 ); SetSkill( SkillName.MagicResist, 110.1, 125.0 ); SetSkill( SkillName.Anatomy, 25.1, 35.0 ); - + Fame = 8000; Karma = -8000; @@ -50,7 +51,7 @@ namespace Server.Mobiles AddLoot( LootPack.Rich, 2 ); AddLoot( LootPack.Gems, 2 ); } - public override bool BleedImmune{ get{ return true; } } + public override bool BleedImmune => true; public override void OnGaveMeleeAttack( Mobile defender ) { @@ -68,11 +69,11 @@ namespace Server.Mobiles defender.FixedEffect( 0x37B9, 10, 5 ); defender.SendLocalizedMessage( 1070839 ); // The creature attacks with stunning force! - + // This should be done in place of the normal attack damage. //AOS.Damage( defender, this, Utility.RandomMinMax( 35, 65 ), 0, 0, 0, 0, 100 ); - defender.Frozen = true; + defender.Frozen = true; ExpireTimer timer = new ExpireTimer( defender, TimeSpan.FromSeconds( 4.0 ) ); timer.Start(); @@ -129,4 +130,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/RevenantLion.cs b/Scripts/Mobiles/Monsters/SE/RevenantLion.cs index bccf33fe8..ad1a198b4 100644 --- a/Scripts/Mobiles/Monsters/SE/RevenantLion.cs +++ b/Scripts/Mobiles/Monsters/SE/RevenantLion.cs @@ -8,15 +8,12 @@ namespace Server.Mobiles [CorpseName( "a revenant lion corpse" )] public class RevenantLion : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.BleedAttack; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack; + public override string DefaultName => "a Revenant Lion"; [Constructible] public RevenantLion() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a Revenant Lion"; Body = 251; SetStr( 276, 325 ); @@ -48,7 +45,7 @@ namespace Server.Mobiles Fame = 4000; Karma = -4000; PackNecroReg( 6, 8 ); - + switch ( Utility.Random( 10 )) { case 0: PackItem( new LeftArm() ); break; @@ -97,9 +94,9 @@ namespace Server.Mobiles // TODO: Bone Pile } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Greater; } } - public override Poison HitPoison{ get{ return Poison.Greater; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Greater; + public override Poison HitPoison => Poison.Greater; public RevenantLion( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/SE/Ronin.cs b/Scripts/Mobiles/Monsters/SE/Ronin.cs index dcffa96bb..3ecc237d7 100644 --- a/Scripts/Mobiles/Monsters/SE/Ronin.cs +++ b/Scripts/Mobiles/Monsters/SE/Ronin.cs @@ -7,17 +7,16 @@ namespace Server.Mobiles [CorpseName( "a ronin corpse" )] public class Ronin : BaseCreature { - public override bool ClickTitle{ get{ return false; } } + public override bool ClickTitle => false; + public override string DefaultName => "a ronin"; [Constructible] public Ronin() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { SpeechHue = Utility.RandomDyedHue(); Hue = Utility.RandomSkinHue(); - Name = "a ronin"; - Body = (( this.Female = Utility.RandomBool() ) ? Body = 0x191 : Body = 0x190); - - Hue = Utility.RandomSkinHue(); + Female = Utility.RandomBool(); + Body = Female ? 0x191 : 0x190; SetStr( 326, 375 ); SetDex( 31, 45 ); @@ -67,9 +66,9 @@ namespace Server.Mobiles case 1: AddItem( new LeatherSuneate() ); break; case 2: AddItem( new PlateSuneate() ); break; } - - + + if( Utility.RandomDouble() > .2 ) AddItem( new NoDachi() ); else @@ -80,7 +79,7 @@ namespace Server.Mobiles Utility.AssignRandomHair( this ); } - + public override void OnDeath( Container c ) { base.OnDeath( c ); @@ -96,9 +95,9 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool BardImmune{ get{ return true; } } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool AlwaysMurderer => true; + public override bool BardImmune => true; + public override bool CanRummageCorpses => true; public Ronin( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/SE/RuneBeetle.cs b/Scripts/Mobiles/Monsters/SE/RuneBeetle.cs index 016a0b0eb..0751188b7 100644 --- a/Scripts/Mobiles/Monsters/SE/RuneBeetle.cs +++ b/Scripts/Mobiles/Monsters/SE/RuneBeetle.cs @@ -9,15 +9,12 @@ namespace Server.Mobiles [CorpseName( "a rune beetle corpse" )] public class RuneBeetle : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.BleedAttack; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack; + public override string DefaultName => "a rune beetle"; [Constructible] public RuneBeetle() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a rune beetle"; Body = 244; SetStr( 401, 460 ); @@ -47,11 +44,11 @@ namespace Server.Mobiles Fame = 15000; Karma = -15000; - - + + if ( Utility.RandomDouble() < .25 ) PackItem( Engines.Plants.Seed.RandomBonsaiSeed() ); - + switch ( Utility.Random( 10 )) { case 0: PackItem( new LeftArm() ); break; @@ -65,10 +62,10 @@ namespace Server.Mobiles case 8: PackItem( new BonePile() ); break; case 9: PackItem( new BonePile() ); break; } - + Tamable = true; ControlSlots = 3; - MinTameSkill = 93.9; + MinTameSkill = 93.9; } @@ -96,17 +93,17 @@ namespace Server.Mobiles { return 0x4E5; } - + public override void GenerateLoot() { AddLoot( LootPack.FilthyRich, 2 ); AddLoot( LootPack.MedScrolls, 1 ); } - public override Poison PoisonImmune{ get{ return Poison.Greater; } } - public override Poison HitPoison{ get{ return Poison.Greater; } } + public override Poison PoisonImmune => Poison.Greater; + public override Poison HitPoison => Poison.Greater; public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } - public override bool CanAngerOnTame { get { return true; } } + public override bool CanAngerOnTame => true; public override void OnGaveMeleeAttack( Mobile defender ) { @@ -237,4 +234,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/TsukiWolf.cs b/Scripts/Mobiles/Monsters/SE/TsukiWolf.cs index 4ac398d47..f3880c9f8 100644 --- a/Scripts/Mobiles/Monsters/SE/TsukiWolf.cs +++ b/Scripts/Mobiles/Monsters/SE/TsukiWolf.cs @@ -8,17 +8,14 @@ namespace Server.Mobiles [CorpseName( "a tsuki wolf corpse" )] public class TsukiWolf : BaseCreature { + public override string DefaultName => "a tsuki wolf"; + [Constructible] public TsukiWolf() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a tsuki wolf"; Body = 250; - - switch( Utility.Random( 3 ) ) - { - case 0: Hue = Utility.RandomNeutralHue(); break; //No, this really isn't accurate ;-> - } + Hue = Utility.Random(3) == 0 ? Utility.RandomNeutralHue() : 0; SetStr( 401, 450 ); SetDex( 151, 200 ); @@ -190,4 +187,4 @@ namespace Server.Mobiles return 0x52A; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/Yamandon.cs b/Scripts/Mobiles/Monsters/SE/Yamandon.cs index 5522870c7..89b292e0f 100644 --- a/Scripts/Mobiles/Monsters/SE/Yamandon.cs +++ b/Scripts/Mobiles/Monsters/SE/Yamandon.cs @@ -8,15 +8,12 @@ namespace Server.Mobiles [CorpseName( "a yamandon corpse" )] public class Yamandon : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.DoubleStrike; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike; + public override string DefaultName => "a yamandon"; [Constructible] public Yamandon() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a yamandon"; Body = 249; SetStr( 786, 930 ); @@ -59,9 +56,9 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 6 ); } - public override bool ReacquireOnMovement{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override Poison HitPoison{ get{ return Utility.RandomBool() ? Poison.Deadly : Poison.Lethal; } } + public override bool ReacquireOnMovement => true; + public override Poison PoisonImmune => Poison.Lethal; + public override Poison HitPoison => Utility.RandomBool() ? Poison.Deadly : Poison.Lethal; public override int TreasureMapLevel{ get{ return 5; } } public override int Hides{ get{ return 20; } } @@ -101,7 +98,7 @@ namespace Server.Mobiles if ( attacker is BaseCreature ) { Mobile m = ((BaseCreature)attacker).GetMaster(); - + if( m != null ) target = m; } @@ -137,7 +134,7 @@ namespace Server.Mobiles } } } - + public override int GetAttackSound() { return 1260; diff --git a/Scripts/Mobiles/Monsters/SE/YomotsuElder.cs b/Scripts/Mobiles/Monsters/SE/YomotsuElder.cs index 3795e0f84..3abee8f54 100644 --- a/Scripts/Mobiles/Monsters/SE/YomotsuElder.cs +++ b/Scripts/Mobiles/Monsters/SE/YomotsuElder.cs @@ -9,15 +9,12 @@ namespace Server.Mobiles [CorpseName( "a wrinkly yomotsu corpse" )] public class YomotsuElder : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.DoubleStrike; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike; + public override string DefaultName => "a yomotsu elder"; [Constructible] public YomotsuElder() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a yomotsu elder"; Body = 255; BaseSoundID = 0x452; @@ -79,7 +76,7 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 2 ); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 5; } } // TODO: Axe Throw @@ -102,7 +99,7 @@ namespace Server.Mobiles defender.Paralyze( TimeSpan.FromSeconds( 4.0 ) ); } } - + public YomotsuElder( Serial serial ) : base( serial ) { } @@ -118,7 +115,7 @@ namespace Server.Mobiles base.Deserialize( reader ); int version = reader.ReadInt(); } - + public override int GetIdleSound() { return 0x42A; diff --git a/Scripts/Mobiles/Monsters/SE/YomotsuPriest.cs b/Scripts/Mobiles/Monsters/SE/YomotsuPriest.cs index bccb253cc..128f648ab 100644 --- a/Scripts/Mobiles/Monsters/SE/YomotsuPriest.cs +++ b/Scripts/Mobiles/Monsters/SE/YomotsuPriest.cs @@ -8,15 +8,12 @@ namespace Server.Mobiles [CorpseName( "a glowing yomotsu corpse" )] public class YomotsuPriest : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.DoubleStrike; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike; + public override string DefaultName => "a yomotsu priest"; [Constructible] public YomotsuPriest() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a yomotsu priest"; Body = 253; BaseSoundID = 0x452; @@ -80,7 +77,7 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 4); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; // TODO: Body Transformation @@ -118,7 +115,7 @@ namespace Server.Mobiles base.Deserialize( reader ); int version = reader.ReadInt(); } - + public override int GetIdleSound() { return 0x42A; diff --git a/Scripts/Mobiles/Monsters/SE/YomotsuWarrior.cs b/Scripts/Mobiles/Monsters/SE/YomotsuWarrior.cs index 7f99eeb27..2ec44c1a5 100644 --- a/Scripts/Mobiles/Monsters/SE/YomotsuWarrior.cs +++ b/Scripts/Mobiles/Monsters/SE/YomotsuWarrior.cs @@ -8,15 +8,12 @@ namespace Server.Mobiles [CorpseName( "a yomotsu corpse" )] public class YomotsuWarrior : BaseCreature { - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.DoubleStrike; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike; + public override string DefaultName => "a yomotsu warrior"; [Constructible] public YomotsuWarrior() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a yomotsu warrior"; Body = 245; BaseSoundID = 0x452; @@ -42,7 +39,7 @@ namespace Server.Mobiles SetSkill( SkillName.Tactics, 95.1, 105.0 ); SetSkill( SkillName.Wrestling, 97.6, 107.5 ); - Fame = 4200; + Fame = 4200; Karma = -4200; PackItem( new GreenGourd() ); @@ -76,12 +73,12 @@ namespace Server.Mobiles AddLoot( LootPack.Gems,2); } - public override bool CanRummageCorpses{ get{ return true; } } + public override bool CanRummageCorpses => true; public override int TreasureMapLevel{ get{ return 3; } } // TODO: Throwing Dagger - public override void OnGaveMeleeAttack( Mobile defender ) + public override void OnGaveMeleeAttack( Mobile defender ) { base.OnGaveMeleeAttack( defender ); @@ -99,7 +96,7 @@ namespace Server.Mobiles defender.Paralyze( TimeSpan.FromSeconds( 4.0 ) ); } } - + public YomotsuWarrior( Serial serial ) : base( serial ) { } @@ -115,7 +112,7 @@ namespace Server.Mobiles base.Deserialize( reader ); int version = reader.ReadInt(); } - + public override int GetIdleSound() { return 0x42A; diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedAirElemental.cs b/Scripts/Mobiles/Monsters/Summons/SummonedAirElemental.cs index 70c77aaae..0dc0dd17a 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedAirElemental.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedAirElemental.cs @@ -9,11 +9,11 @@ namespace Server.Mobiles { public override double DispelDifficulty{ get{ return 117.5; } } public override double DispelFocus{ get{ return 45.0; } } + public override string DefaultName => "an air elemental"; [Constructible] public SummonedAirElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an air elemental"; Body = 13; Hue = 0x4001; BaseSoundID = 655; @@ -66,4 +66,4 @@ namespace Server.Mobiles BaseSoundID = 655; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs b/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs index 8bf59009f..7dd34fe6e 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs @@ -43,8 +43,8 @@ namespace Server.Mobiles ControlSlots = Core.SE ? 4 : 5; } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } // TODO: Immune to poison? - public override bool CanFly { get { return true; } } + public override Poison PoisonImmune => Poison.Regular; // TODO: Immune to poison? + public override bool CanFly => true; public SummonedDaemon( Serial serial ) : base( serial ) { @@ -62,4 +62,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedEarthElemental.cs b/Scripts/Mobiles/Monsters/Summons/SummonedEarthElemental.cs index 83f5c4319..1e470614d 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedEarthElemental.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedEarthElemental.cs @@ -10,11 +10,11 @@ namespace Server.Mobiles { public override double DispelDifficulty{ get{ return 117.5; } } public override double DispelFocus{ get{ return 45.0; } } + public override string DefaultName => "an earth elemental"; [Constructible] public SummonedEarthElemental() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an earth elemental"; Body = 14; BaseSoundID = 268; @@ -58,4 +58,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedFireElemental.cs b/Scripts/Mobiles/Monsters/Summons/SummonedFireElemental.cs index 6b63ffdff..c532dcb94 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedFireElemental.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedFireElemental.cs @@ -9,11 +9,11 @@ namespace Server.Mobiles { public override double DispelDifficulty{ get{ return 117.5; } } public override double DispelFocus{ get{ return 45.0; } } + public override string DefaultName => "a fire elemental"; [Constructible] public SummonedFireElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a fire elemental"; Body = 15; BaseSoundID = 838; diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedWaterElemental.cs b/Scripts/Mobiles/Monsters/Summons/SummonedWaterElemental.cs index 8e2979e29..5db6b4495 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedWaterElemental.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedWaterElemental.cs @@ -9,11 +9,11 @@ namespace Server.Mobiles { public override double DispelDifficulty{ get{ return 117.5; } } public override double DispelFocus{ get{ return 45.0; } } + public override string DefaultName => "a water elemental"; [Constructible] public SummonedWaterElemental () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a water elemental"; Body = 16; BaseSoundID = 278; @@ -62,4 +62,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/Barracoon.cs b/Scripts/Mobiles/Special/Barracoon.cs index 62536d4ac..8f1eb4971 100644 --- a/Scripts/Mobiles/Special/Barracoon.cs +++ b/Scripts/Mobiles/Special/Barracoon.cs @@ -21,10 +21,11 @@ namespace Server.Mobiles public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { MonsterStatuetteType.Slime }; } } + public override string DefaultName => "Barracoon"; + [Constructible] public Barracoon() : base( AIType.AI_Melee ) { - Name = "Barracoon"; Title = "the piper"; Body = 0x190; Hue = 0x83EC; @@ -70,16 +71,16 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 3 ); } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool AutoDispel{ get{ return true; } } + public override bool AlwaysMurderer => true; + public override bool AutoDispel => true; public override double AutoDispelChance{ get{ return 1.0; } } - public override bool BardImmune{ get{ return !Core.SE; } } - public override bool Unprovokable{ get{ return Core.SE; } } - public override bool Uncalmable{ get{ return Core.SE; } } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; + public override bool Uncalmable => Core.SE; + public override Poison PoisonImmune => Poison.Deadly; - public override bool ShowFameTitle{ get{ return false; } } - public override bool ClickTitle{ get{ return false; } } + public override bool ShowFameTitle => false; + public override bool ClickTitle => false; public void Polymorph( Mobile m ) { @@ -237,4 +238,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/BaseChampion.cs b/Scripts/Mobiles/Special/BaseChampion.cs index 4e42edeae..6646e8c1c 100644 --- a/Scripts/Mobiles/Special/BaseChampion.cs +++ b/Scripts/Mobiles/Special/BaseChampion.cs @@ -9,8 +9,8 @@ namespace Server.Mobiles { public abstract class BaseChampion : BaseCreature { - public override bool CanMoveOverObstacles { get { return true; } } - public override bool CanDestroyObstacles { get { return true; } } + public override bool CanMoveOverObstacles => true; + public override bool CanDestroyObstacles => true; public BaseChampion( AIType aiType ) : this( aiType, FightMode.Closest ) { @@ -65,7 +65,7 @@ namespace Server.Mobiles return null; int random = Utility.Random( list.Length ); - + Type type = list[random]; Item artifact = Loot.Construct( type ); @@ -294,7 +294,7 @@ namespace Server.Mobiles return; Gold g = new Gold( 500, 1000 ); - + g.MoveToWorld( new Point3D( m_X, m_Y, z ), m_Map ); if ( 0.5 >= Utility.RandomDouble() ) @@ -326,4 +326,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/CapturedHordeMinion.cs b/Scripts/Mobiles/Special/CapturedHordeMinion.cs index d0b5637cb..24a514109 100644 --- a/Scripts/Mobiles/Special/CapturedHordeMinion.cs +++ b/Scripts/Mobiles/Special/CapturedHordeMinion.cs @@ -11,7 +11,7 @@ namespace Server.Mobiles this.FightMode = FightMode.None; } - public override bool InitialInnocent{ get{ return true; } } + public override bool InitialInnocent => true; public override bool CanBeDamaged() { @@ -36,4 +36,4 @@ namespace Server.Mobiles int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/ChaosGuard.cs b/Scripts/Mobiles/Special/ChaosGuard.cs index f67e34b4e..a47812c8c 100644 --- a/Scripts/Mobiles/Special/ChaosGuard.cs +++ b/Scripts/Mobiles/Special/ChaosGuard.cs @@ -13,7 +13,7 @@ namespace Server.Mobiles public override int SignupNumber{ get{ return 1007140; } } // Sign up with a guild of chaos if thou art interested. public override GuildType Type{ get{ return GuildType.Chaos; } } - public override bool BardImmune{ get{ return true; } } + public override bool BardImmune => true; [Constructible] public ChaosGuard() @@ -38,4 +38,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/DarkGuardian.cs b/Scripts/Mobiles/Special/DarkGuardian.cs index 1e2f40cd4..81eacb33c 100644 --- a/Scripts/Mobiles/Special/DarkGuardian.cs +++ b/Scripts/Mobiles/Special/DarkGuardian.cs @@ -7,10 +7,11 @@ namespace Server.Mobiles [CorpseName( "a dark guardians' corpse" )] public class DarkGuardian : BaseCreature { + public override string DefaultName => "a dark guardian"; + [Constructible] public DarkGuardian() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a dark guardian"; Body = 78; BaseSoundID = 0x3E9; @@ -62,9 +63,9 @@ namespace Server.Mobiles } public override int TreasureMapLevel{ get{ return 2; } } - public override bool BleedImmune{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override bool Unprovokable { get { return true; } } + public override bool BleedImmune => true; + public override Poison PoisonImmune => Poison.Lethal; + public override bool Unprovokable => true; public override void Serialize( GenericWriter writer ) { diff --git a/Scripts/Mobiles/Special/DummySpecific.cs b/Scripts/Mobiles/Special/DummySpecific.cs index da3239219..c280dd50e 100644 --- a/Scripts/Mobiles/Special/DummySpecific.cs +++ b/Scripts/Mobiles/Special/DummySpecific.cs @@ -10,15 +10,16 @@ namespace Server.Mobiles /// You can set its value in game /// It die after 5 minutes, so your test server stay clean /// Create a macro to help your creation "[add Dummy 1 15 7 -1 0.5 2" - /// + /// /// A iTeam of negative will set a faction at random - /// + /// /// Say Kill if you want them to die - /// + /// /// public class DummyMace : Dummy { + public override string DefaultName => "Macer"; [Constructible] public DummyMace() : base(AIType.AI_Melee, FightMode.Closest, 15, 1, 0.2, 0.6) @@ -34,10 +35,6 @@ namespace Server.Mobiles this.Skills[SkillName.Healing].Base = 120; this.Skills[SkillName.Tactics].Base = 120; - - // Name - this.Name = "Macer"; - // Equip WarHammer war = new WarHammer(); war.Movable = true; @@ -95,6 +92,7 @@ namespace Server.Mobiles public class DummyFence : Dummy { + public override string DefaultName => "Fencer"; [Constructible] public DummyFence() : base(AIType.AI_Melee, FightMode.Closest, 15, 1, 0.2, 0.6) @@ -110,9 +108,6 @@ namespace Server.Mobiles this.Skills[SkillName.Healing].Base = 120; this.Skills[SkillName.Tactics].Base = 120; - // Name - this.Name = "Fencer"; - // Equip Spear ssp = new Spear(); ssp.Movable = true; @@ -171,7 +166,7 @@ namespace Server.Mobiles public class DummySword : Dummy { - + public override string DefaultName => "Swordsman"; [Constructible] public DummySword() : base(AIType.AI_Melee, FightMode.Closest, 15, 1, 0.2, 0.6) { @@ -187,10 +182,6 @@ namespace Server.Mobiles this.Skills[SkillName.Tactics].Base = 120; this.Skills[SkillName.Parry].Base = 120; - - // Name - this.Name = "Swordsman"; - // Equip Katana kat = new Katana(); kat.Crafter = this; @@ -248,7 +239,7 @@ namespace Server.Mobiles public class DummyNox : Dummy { - + public override string DefaultName => "Nox Mage"; [Constructible] public DummyNox() : base(AIType.AI_Mage, FightMode.Closest, 15, 1, 0.2, 0.6) { @@ -266,10 +257,6 @@ namespace Server.Mobiles this.Skills[SkillName.Meditation].Base = 120; this.Skills[SkillName.Poisoning].Base = 100; - - // Name - this.Name = "Nox Mage"; - // Equip Spellbook book = new Spellbook(); book.Movable = false; @@ -319,6 +306,7 @@ namespace Server.Mobiles public class DummyStun : Dummy { + public override string DefaultName => "Stun Mage"; [Constructible] public DummyStun() : base(AIType.AI_Mage, FightMode.Closest, 15, 1, 0.2, 0.6) @@ -337,10 +325,6 @@ namespace Server.Mobiles this.Skills[SkillName.Meditation].Base = 100; this.Skills[SkillName.Poisoning].Base = 100; - - // Name - this.Name = "Stun Mage"; - // Equip Spellbook book = new Spellbook(); book.Movable = false; @@ -413,6 +397,7 @@ namespace Server.Mobiles public class DummySuper : Dummy { + public override string DefaultName => "Super Mage"; [Constructible] public DummySuper() : base(AIType.AI_Mage, FightMode.Closest, 15, 1, 0.2, 0.6) @@ -431,9 +416,6 @@ namespace Server.Mobiles this.Skills[SkillName.Poisoning].Base = 100; this.Skills[SkillName.Inscribe].Base = 100; - // Name - this.Name = "Super Mage"; - // Equip Spellbook book = new Spellbook(); book.Movable = false; @@ -511,7 +493,7 @@ namespace Server.Mobiles public class DummyHealer : Dummy { - + public override string DefaultName => "Healer"; [Constructible] public DummyHealer() : base(AIType.AI_Healer, FightMode.Closest, 15, 1, 0.2, 0.6) { @@ -528,9 +510,6 @@ namespace Server.Mobiles this.Skills[SkillName.Meditation].Base = 120; this.Skills[SkillName.Healing].Base = 100; - // Name - this.Name = "Healer"; - // Equip Spellbook book = new Spellbook(); book.Movable = false; @@ -602,6 +581,7 @@ namespace Server.Mobiles public class DummyAssassin : Dummy { + public override string DefaultName => "Hybrid Assassin"; [Constructible] public DummyAssassin() : base(AIType.AI_Melee, FightMode.Closest, 15, 1, 0.2, 0.6) @@ -619,9 +599,6 @@ namespace Server.Mobiles this.Skills[SkillName.Meditation].Base = 120; this.Skills[SkillName.Poisoning].Base = 100; - // Name - this.Name = "Hybrid Assassin"; - // Equip Spellbook book = new Spellbook(); book.Movable = false; @@ -722,6 +699,7 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.DummyTheif" )] public class DummyThief : Dummy { + public override string DefaultName => "Hybrid Thief"; [Constructible] public DummyThief() : base(AIType.AI_Thief, FightMode.Closest, 15, 1, 0.2, 0.6) { @@ -738,9 +716,6 @@ namespace Server.Mobiles this.Skills[SkillName.Meditation].Base = 120; this.Skills[SkillName.Wrestling].Base = 120; - // Name - this.Name = "Hybrid Thief"; - // Equip Spellbook book = new Spellbook(); book.Movable = false; @@ -811,4 +786,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/Harrower.cs b/Scripts/Mobiles/Special/Harrower.cs index 8e9d9e899..ff56c0f92 100644 --- a/Scripts/Mobiles/Special/Harrower.cs +++ b/Scripts/Mobiles/Special/Harrower.cs @@ -77,12 +77,12 @@ namespace Server.Mobiles } } + public override string DefaultName => "the harrower"; + [Constructible] public Harrower() : base( AIType.AI_Mage, FightMode.Closest, 18, 1, 0.2, 0.4 ) { m_Instances.Add( this ); - - Name = "the harrower"; BodyValue = 146; SetStr( 900, 1000 ); @@ -122,9 +122,9 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override bool AutoDispel{ get{ return true; } } - public override bool Unprovokable{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool AutoDispel => true; + public override bool Unprovokable => true; + public override Poison PoisonImmune => Poison.Lethal; private static readonly double[] m_Offsets = new double[] { @@ -220,7 +220,7 @@ namespace Server.Mobiles base.OnAfterDelete(); } - public override bool DisallowAllMoves{ get{ return m_TrueForm; } } + public override bool DisallowAllMoves => m_TrueForm; public override void Serialize( GenericWriter writer ) { @@ -500,7 +500,7 @@ namespace Server.Mobiles return null; int random = Utility.Random( list.Length ); - + Type type = list[random]; return Loot.Construct( type ); @@ -636,7 +636,7 @@ namespace Server.Mobiles return; Gold g = new Gold( 750, 1250 ); - + g.MoveToWorld( new Point3D( m_X, m_Y, z ), m_Map ); if ( 0.5 >= Utility.RandomDouble() ) @@ -668,4 +668,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/HarrowerTentacles.cs b/Scripts/Mobiles/Special/HarrowerTentacles.cs index b15219e04..90fcdf572 100644 --- a/Scripts/Mobiles/Special/HarrowerTentacles.cs +++ b/Scripts/Mobiles/Special/HarrowerTentacles.cs @@ -24,16 +24,16 @@ namespace Server.Mobiles } } + public override string DefaultName => "tentacles of the harrower"; + [Constructible] public HarrowerTentacles() : this( null ) { } - + public HarrowerTentacles( Mobile harrower ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { m_Harrower = harrower; - - Name = "tentacles of the harrower"; Body = 129; SetStr( 901, 1000 ); @@ -111,10 +111,10 @@ namespace Server.Mobiles AddLoot( LootPack.HighScrolls, 2 ); } - public override bool AutoDispel{ get{ return true; } } - public override bool Unprovokable{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override bool DisallowAllMoves{ get{ return true; } } + public override bool AutoDispel => true; + public override bool Unprovokable => true; + public override Poison PoisonImmune => Poison.Lethal; + public override bool DisallowAllMoves => true; public HarrowerTentacles( Serial serial ) : base( serial ) { @@ -218,4 +218,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/LordOaks.cs b/Scripts/Mobiles/Special/LordOaks.cs index e9f0359e7..897acc048 100644 --- a/Scripts/Mobiles/Special/LordOaks.cs +++ b/Scripts/Mobiles/Special/LordOaks.cs @@ -26,12 +26,12 @@ namespace Server.Mobiles public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { }; } } + public override string DefaultName => "Lord Oaks"; + [Constructible] public LordOaks() : base( AIType.AI_Mage, FightMode.Evil ) { Body = 175; - Name = "Lord Oaks"; - SetStr( 403, 850 ); SetDex( 101, 150 ); SetInt( 503, 800 ); @@ -68,18 +68,18 @@ namespace Server.Mobiles { AddLoot( LootPack.UltraRich, 5 ); } - - public override bool AutoDispel{ get{ return true; } } - public override bool CanFly { get { return true; } } - public override bool BardImmune{ get{ return !Core.SE; } } - public override bool Unprovokable{ get{ return Core.SE; } } - public override bool Uncalmable{ get{ return Core.SE; } } + + public override bool AutoDispel => true; + public override bool CanFly => true; + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; + public override bool Uncalmable => Core.SE; public override OppositionGroup OppositionGroup { get{ return OppositionGroup.FeyAndUndead; } } - - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } + + public override Poison PoisonImmune => Poison.Deadly; public void SpawnPixies( Mobile target ) { @@ -235,4 +235,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/Mephitis.cs b/Scripts/Mobiles/Special/Mephitis.cs index e2eb971d7..a60a7d255 100644 --- a/Scripts/Mobiles/Special/Mephitis.cs +++ b/Scripts/Mobiles/Special/Mephitis.cs @@ -15,12 +15,12 @@ namespace Server.Mobiles public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { MonsterStatuetteType.Spider }; } } + public override string DefaultName => "Mephitis"; + [Constructible] public Mephitis() : base( AIType.AI_Melee ) { Body = 173; - Name = "Mephitis"; - BaseSoundID = 0x183; SetStr( 505, 1000 ); @@ -56,8 +56,8 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 4 ); } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } - public override Poison HitPoison{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; + public override Poison HitPoison => Poison.Lethal; public override void OnGotMeleeAttack( Mobile attacker ) { @@ -84,4 +84,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/Neira.cs b/Scripts/Mobiles/Special/Neira.cs index c4e237c0e..04e9df4a5 100644 --- a/Scripts/Mobiles/Special/Neira.cs +++ b/Scripts/Mobiles/Special/Neira.cs @@ -18,10 +18,11 @@ namespace Server.Mobiles public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { }; } } + public override string DefaultName => "Neira"; + [Constructible] public Neira() : base( AIType.AI_Mage ) { - Name = "Neira"; Title = "the necromancer"; Body = 401; Hue = 0x83EC; @@ -92,7 +93,7 @@ namespace Server.Mobiles return base.OnBeforeDeath(); } - + private bool m_SpeedBoost; public override void OnDamage( int amount, Mobile from, bool willKill ) @@ -100,9 +101,9 @@ namespace Server.Mobiles CheckSpeedBoost(); base.OnDamage( amount, from, willKill ); } - + private const double SpeedBoostScalar = 1.2; - + private void CheckSpeedBoost() { if( Hits < (HitsMax / 4 ) ) @@ -112,7 +113,7 @@ namespace Server.Mobiles ActiveSpeed /= SpeedBoostScalar; PassiveSpeed /= SpeedBoostScalar; m_SpeedBoost = true; - } + } } else if( m_SpeedBoost ) { @@ -193,14 +194,14 @@ namespace Server.Mobiles } } - public override bool AlwaysMurderer{ get{ return true; } } - public override bool BardImmune{ get{ return !Core.SE; } } - public override bool Unprovokable{ get{ return Core.SE; } } - public override bool Uncalmable{ get{ return Core.SE; } } - public override Poison PoisonImmune{ get{ return Poison.Deadly; } } + public override bool AlwaysMurderer => true; + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; + public override bool Uncalmable => Core.SE; + public override Poison PoisonImmune => Poison.Deadly; - public override bool ShowFameTitle{ get{ return false; } } - public override bool ClickTitle{ get{ return false; } } + public override bool ShowFameTitle => false; + public override bool ClickTitle => false; public override void OnGaveMeleeAttack( Mobile defender ) { @@ -284,7 +285,7 @@ namespace Server.Mobiles base.Deserialize( reader ); int version = reader.ReadInt(); - + switch( version ) { case 1: @@ -295,4 +296,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/OrderGuard.cs b/Scripts/Mobiles/Special/OrderGuard.cs index 12a925f9e..94f028533 100644 --- a/Scripts/Mobiles/Special/OrderGuard.cs +++ b/Scripts/Mobiles/Special/OrderGuard.cs @@ -13,7 +13,7 @@ namespace Server.Mobiles public override int SignupNumber{ get{ return 1007141; } } // Sign up with a guild of order if thou art interested. public override GuildType Type{ get{ return GuildType.Order; } } - public override bool BardImmune{ get{ return true; } } + public override bool BardImmune => true; [Constructible] public OrderGuard() @@ -38,4 +38,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/Rikktor.cs b/Scripts/Mobiles/Special/Rikktor.cs index af82ca828..f6b65c35a 100644 --- a/Scripts/Mobiles/Special/Rikktor.cs +++ b/Scripts/Mobiles/Special/Rikktor.cs @@ -22,11 +22,12 @@ namespace Server.Mobiles public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { MonsterStatuetteType.OphidianArchMage, MonsterStatuetteType.OphidianWarrior }; } } + public override string DefaultName => "Rikktor"; + [Constructible] public Rikktor() : base( AIType.AI_Melee ) { Body = 172; - Name = "Rikktor"; SetStr( 701, 900 ); SetDex( 201, 350 ); @@ -62,7 +63,7 @@ namespace Server.Mobiles AddLoot( LootPack.UltraRich, 4 ); } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override ScaleType ScaleType{ get{ return ScaleType.All; } } public override int Scales{ get{ return 20; } } @@ -159,4 +160,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/Semidar.cs b/Scripts/Mobiles/Special/Semidar.cs index 980888634..c28d3b54b 100644 --- a/Scripts/Mobiles/Special/Semidar.cs +++ b/Scripts/Mobiles/Special/Semidar.cs @@ -15,10 +15,11 @@ namespace Server.Mobiles public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { }; } } + public override string DefaultName => "Semidar"; + [Constructible] public Semidar() : base( AIType.AI_Mage ) { - Name = "Semidar"; Body = 174; BaseSoundID = 0x4B0; @@ -59,8 +60,8 @@ namespace Server.Mobiles AddLoot( LootPack.FilthyRich ); } - public override bool Unprovokable{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Lethal; } } + public override bool Unprovokable => true; + public override Poison PoisonImmune => Poison.Lethal; public override void CheckReflect( Mobile caster, ref bool reflect ) { diff --git a/Scripts/Mobiles/Special/Serado.cs b/Scripts/Mobiles/Special/Serado.cs index 62f646d17..897a826b6 100644 --- a/Scripts/Mobiles/Special/Serado.cs +++ b/Scripts/Mobiles/Special/Serado.cs @@ -19,15 +19,13 @@ namespace Server.Mobiles public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { }; } } - public override WeaponAbility GetWeaponAbility() - { - return WeaponAbility.DoubleStrike; - } + public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike; + + public override string DefaultName => "Serado"; [Constructible] public Serado() : base( AIType.AI_Melee ) { - Name = "Serado"; Title = "the awakened"; Body = 249; @@ -72,14 +70,14 @@ namespace Server.Mobiles public override int TreasureMapLevel{ get{ return 5; } } - 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 double HitPoisonChance{ get{ return 0.8; } } public override int Feathers{ get{ return 30; } } - public override bool ShowFameTitle{ get{ return false; } } - public override bool ClickTitle{ get{ return false; } } + public override bool ShowFameTitle => false; + public override bool ClickTitle => false; // TODO: Hit Lightning Area diff --git a/Scripts/Mobiles/Special/ServantOfSemidar.cs b/Scripts/Mobiles/Special/ServantOfSemidar.cs index 83cebb8d2..f8a1e4367 100644 --- a/Scripts/Mobiles/Special/ServantOfSemidar.cs +++ b/Scripts/Mobiles/Special/ServantOfSemidar.cs @@ -5,16 +5,17 @@ namespace Server.Mobiles { public class ServantOfSemidar : BaseCreature { + public override string DefaultName => "a Servant of Semidar"; + [Constructible] public ServantOfSemidar() : base( AIType.AI_Melee, FightMode.None, 10, 1, 0.2, 0.4 ) { - Name = "a servant of Semidar"; Body = 0x26; } - public override bool DisallowAllMoves{ get{ return true; } } + public override bool DisallowAllMoves => true; - public override bool InitialInnocent{ get{ return true; } } + public override bool InitialInnocent => true; public override bool CanBeDamaged() { @@ -46,4 +47,4 @@ namespace Server.Mobiles int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/Silvani.cs b/Scripts/Mobiles/Special/Silvani.cs index afc567c41..8c838969e 100644 --- a/Scripts/Mobiles/Special/Silvani.cs +++ b/Scripts/Mobiles/Special/Silvani.cs @@ -6,10 +6,11 @@ namespace Server.Mobiles { public class Silvani : BaseCreature { + public override string DefaultName => "Silvani"; + [Constructible] public Silvani() : base( AIType.AI_Mage, FightMode.Evil, 18, 1, 0.1, 0.2 ) { - Name = "Silvani"; Body = 176; BaseSoundID = 0x467; @@ -53,9 +54,9 @@ namespace Server.Mobiles get{ return OppositionGroup.FeyAndUndead; } } - public override bool CanFly { get { return true; } } - public override bool Unprovokable{ get{ return true; } } - public override Poison PoisonImmune{ get{ return Poison.Regular; } } + public override bool CanFly => true; + public override bool Unprovokable => true; + public override Poison PoisonImmune => Poison.Regular; public override int TreasureMapLevel{ get{ return 5; } } public void SpawnPixies( Mobile target ) @@ -135,4 +136,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Special/Wanderer.cs b/Scripts/Mobiles/Special/Wanderer.cs index 33197e926..7cd5a8d3a 100644 --- a/Scripts/Mobiles/Special/Wanderer.cs +++ b/Scripts/Mobiles/Special/Wanderer.cs @@ -10,9 +10,9 @@ namespace Server.Mobiles [Constructible] public Wanderer() { - this.Name = "Me"; - this.Body = 0x1; - this.AccessLevel = AccessLevel.Counselor; + Name = "Me"; + Body = 0x1; + AccessLevel = AccessLevel.Counselor; m_Timer = new InternalTimer( this ); m_Timer.Start(); @@ -66,4 +66,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Townfolk/Actor.cs b/Scripts/Mobiles/Townfolk/Actor.cs index 9a571be01..9a4b731b9 100644 --- a/Scripts/Mobiles/Townfolk/Actor.cs +++ b/Scripts/Mobiles/Townfolk/Actor.cs @@ -1,69 +1,69 @@ -using System; -using Server.Items; -using Server; -using Server.Misc; +using System; +using Server.Items; +using Server; +using Server.Misc; -namespace Server.Mobiles -{ - public class Actor : BaseCreature - { - [Constructible] - public Actor () : base( AIType.AI_Animal, FightMode.None, 10, 1, 0.2, 0.4 ) - { - InitStats( 31, 41, 51 ); +namespace Server.Mobiles +{ + public class Actor : BaseCreature + { + [Constructible] + public Actor () : base( AIType.AI_Animal, FightMode.None, 10, 1, 0.2, 0.4 ) + { + InitStats( 31, 41, 51 ); - SpeechHue = Utility.RandomDyedHue(); + SpeechHue = Utility.RandomDyedHue(); - Hue = Utility.RandomSkinHue(); + Hue = Utility.RandomSkinHue(); - if ( this.Female = Utility.RandomBool() ) - { - this.Body = 0x191; + if ( this.Female = Utility.RandomBool() ) + { + this.Body = 0x191; this.Name = NameList.RandomName( "female" ); - AddItem( new FancyDress( Utility.RandomDyedHue() ) ); - Title = "the actress"; - } - else - { - this.Body = 0x190; + AddItem( new FancyDress( Utility.RandomDyedHue() ) ); + Title = "the actress"; + } + else + { + this.Body = 0x190; this.Name = NameList.RandomName( "male" ); - AddItem( new LongPants( Utility.RandomNeutralHue() ) ); + AddItem( new LongPants( Utility.RandomNeutralHue() ) ); AddItem( new FancyShirt( Utility.RandomDyedHue() ) ); Title = "the actor"; - } + } AddItem( new Boots( Utility.RandomNeutralHue() ) ); Utility.AssignRandomHair( this ); - Container pack = new Backpack(); + Container pack = new Backpack(); - pack.DropItem( new Gold( 250, 300 ) ); + pack.DropItem( new Gold( 250, 300 ) ); - pack.Movable = false; + pack.Movable = false; - AddItem( pack ); - } + AddItem( pack ); + } - public override bool ClickTitle{ get{ return false; } } + public override bool ClickTitle => false; - public Actor( Serial serial ) : base( serial ) - { - } + public Actor( Serial serial ) : base( serial ) + { + } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); - writer.Write( (int) 0 ); // version - } + writer.Write( (int) 0 ); // version + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } -} + int version = reader.ReadInt(); + } + } +} diff --git a/Scripts/Mobiles/Townfolk/Artist.cs b/Scripts/Mobiles/Townfolk/Artist.cs index 864c16b4b..92df367ae 100644 --- a/Scripts/Mobiles/Townfolk/Artist.cs +++ b/Scripts/Mobiles/Townfolk/Artist.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class Artist : BaseCreature { - public override bool CanTeach { get { return true; } } + public override bool CanTeach => true; [Constructible] public Artist() @@ -49,7 +49,7 @@ namespace Server.Mobiles AddItem( pack ); } - public override bool ClickTitle { get { return false; } } + public override bool ClickTitle => false; public Artist( Serial serial ) @@ -61,7 +61,7 @@ namespace Server.Mobiles { base.Serialize( writer ); - writer.Write( (int)0 ); // version + writer.Write( (int)0 ); // version } public override void Deserialize( GenericReader reader ) diff --git a/Scripts/Mobiles/Townfolk/BaseEscortable.cs b/Scripts/Mobiles/Townfolk/BaseEscortable.cs index 794296f3a..40dc10dd3 100644 --- a/Scripts/Mobiles/Townfolk/BaseEscortable.cs +++ b/Scripts/Mobiles/Townfolk/BaseEscortable.cs @@ -18,7 +18,7 @@ namespace Server.Mobiles public static readonly TimeSpan AbandonDelay = MLQuestSystem.Enabled ? TimeSpan.FromMinutes( 1.0 ) : TimeSpan.FromMinutes( 2.0 ); public static readonly TimeSpan DeleteTime = MLQuestSystem.Enabled ? TimeSpan.FromSeconds( 100 ) : TimeSpan.FromSeconds( 30 ); - public override bool StaticMLQuester { get { return false; } } // Suppress automatic quest registration on creation/deserialization + public override bool StaticMLQuester => false; // Suppress automatic quest registration on creation/deserialization private MLQuest m_MLQuest; @@ -104,7 +104,7 @@ namespace Server.Mobiles get { return ( m_DeleteTimer != null ); } } - public override bool Commandable { get { return false; } } // Our master cannot boss us around! + public override bool Commandable => false; // Our master cannot boss us around! public override bool DeleteCorpseOnDeath { get { return m_DeleteCorpse; } } [CommandProperty(AccessLevel.GameMaster)] @@ -775,4 +775,4 @@ namespace Server.Mobiles m_Mobile.Delete(); // OSI just seems to delete instantly } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Townfolk/BrideGroom.cs b/Scripts/Mobiles/Townfolk/BrideGroom.cs index 2c9b43d63..d3686eb28 100644 --- a/Scripts/Mobiles/Townfolk/BrideGroom.cs +++ b/Scripts/Mobiles/Townfolk/BrideGroom.cs @@ -16,8 +16,8 @@ namespace Server.Mobiles Title = "the groom"; } - public override bool CanTeach{ get{ return true; } } - public override bool ClickTitle{ get{ return false; } } // Do not display 'the groom' when single-clicking + public override bool CanTeach => true; + public override bool ClickTitle => false; // Do not display 'the groom' when single-clicking private static int GetRandomHue() { @@ -77,4 +77,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Townfolk/EscortableMage.cs b/Scripts/Mobiles/Townfolk/EscortableMage.cs index 147dc9d5e..a1860e9bf 100644 --- a/Scripts/Mobiles/Townfolk/EscortableMage.cs +++ b/Scripts/Mobiles/Townfolk/EscortableMage.cs @@ -19,8 +19,8 @@ namespace Server.Mobiles SetSkill( SkillName.MagicResist, 80.0, 100.0 ); } - public override bool CanTeach{ get{ return true; } } - public override bool ClickTitle{ get{ return false; } } // Do not display 'the mage' when single-clicking + public override bool CanTeach => true; + public override bool ClickTitle => false; // Do not display 'the mage' when single-clicking private static int GetRandomHue() { @@ -71,4 +71,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Townfolk/Gypsy.cs b/Scripts/Mobiles/Townfolk/Gypsy.cs index b3829cf62..cc84ec2cd 100644 --- a/Scripts/Mobiles/Townfolk/Gypsy.cs +++ b/Scripts/Mobiles/Townfolk/Gypsy.cs @@ -57,8 +57,8 @@ namespace Server.Mobiles } - public override bool CanTeach { get { return true; } } - public override bool ClickTitle { get { return false; } } + public override bool CanTeach => true; + public override bool ClickTitle => false; public Gypsy( Serial serial ) : base( serial ) @@ -69,7 +69,7 @@ namespace Server.Mobiles { base.Serialize( writer ); - writer.Write( (int)0 ); // version + writer.Write( (int)0 ); // version } public override void Deserialize( GenericReader reader ) diff --git a/Scripts/Mobiles/Townfolk/HarborMaster.cs b/Scripts/Mobiles/Townfolk/HarborMaster.cs index 1b4f0b662..811785f3a 100644 --- a/Scripts/Mobiles/Townfolk/HarborMaster.cs +++ b/Scripts/Mobiles/Townfolk/HarborMaster.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class HarborMaster : BaseCreature { - public override bool CanTeach { get { return false; } } + public override bool CanTeach => false; [Constructible] public HarborMaster() @@ -51,7 +51,7 @@ namespace Server.Mobiles AddItem( pack ); } - public override bool ClickTitle { get { return false; } } + public override bool ClickTitle => false; public HarborMaster( Serial serial ) @@ -63,7 +63,7 @@ namespace Server.Mobiles { base.Serialize( writer ); - writer.Write( (int)0 ); // version + writer.Write( (int)0 ); // version } public override void Deserialize( GenericReader reader ) diff --git a/Scripts/Mobiles/Townfolk/Merchant.cs b/Scripts/Mobiles/Townfolk/Merchant.cs index 3036458e7..7583575e8 100644 --- a/Scripts/Mobiles/Townfolk/Merchant.cs +++ b/Scripts/Mobiles/Townfolk/Merchant.cs @@ -15,8 +15,8 @@ namespace Server.Mobiles SetSkill( SkillName.ArmsLore, 55, 78 ); } - public override bool CanTeach { get { return true; } } - public override bool ClickTitle { get { return false; } } // Do not display 'the merchant' when single-clicking + public override bool CanTeach => true; + public override bool ClickTitle => false; // Do not display 'the merchant' when single-clicking private static int GetRandomHue() { @@ -82,4 +82,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Townfolk/Messenger.cs b/Scripts/Mobiles/Townfolk/Messenger.cs index 0d07f859c..57824a925 100644 --- a/Scripts/Mobiles/Townfolk/Messenger.cs +++ b/Scripts/Mobiles/Townfolk/Messenger.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles Title = "the messenger"; } - public override bool CanTeach{ get{ return true; } } - public override bool ClickTitle{ get{ return false; } } // Do not display 'the messenger' when single-clicking + public override bool CanTeach => true; + public override bool ClickTitle => false; // Do not display 'the messenger' when single-clicking private static int GetRandomHue() { @@ -83,4 +83,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Townfolk/Ninja.cs b/Scripts/Mobiles/Townfolk/Ninja.cs index 24d3b139b..a3d464d60 100644 --- a/Scripts/Mobiles/Townfolk/Ninja.cs +++ b/Scripts/Mobiles/Townfolk/Ninja.cs @@ -6,8 +6,8 @@ namespace Server.Mobiles { public class Ninja : BaseCreature { - public override bool CanTeach{ get{ return true; } } - public override bool ClickTitle{ get{ return false; } } + public override bool CanTeach => true; + public override bool ClickTitle => false; [Constructible] public Ninja() : base( AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) diff --git a/Scripts/Mobiles/Townfolk/Noble.cs b/Scripts/Mobiles/Townfolk/Noble.cs index 9d69716ba..7b93e2d24 100644 --- a/Scripts/Mobiles/Townfolk/Noble.cs +++ b/Scripts/Mobiles/Townfolk/Noble.cs @@ -17,8 +17,8 @@ namespace Server.Mobiles SetSkill( SkillName.Tactics, 80.0, 100.0 ); } - public override bool CanTeach{ get{ return true; } } - public override bool ClickTitle{ get{ return false; } } // Do not display 'the noble' when single-clicking + public override bool CanTeach => true; + public override bool ClickTitle => false; // Do not display 'the noble' when single-clicking private static int GetRandomHue() { @@ -81,4 +81,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Townfolk/Peasant.cs b/Scripts/Mobiles/Townfolk/Peasant.cs index 3881ed8fe..891b687cf 100644 --- a/Scripts/Mobiles/Townfolk/Peasant.cs +++ b/Scripts/Mobiles/Townfolk/Peasant.cs @@ -14,8 +14,8 @@ namespace Server.Mobiles } - public override bool CanTeach{ get{ return true; } } - public override bool ClickTitle{ get{ return false; } } // Do not display 'the peasant' when single-clicking + public override bool CanTeach => true; + public override bool ClickTitle => false; // Do not display 'the peasant' when single-clicking private static int GetRandomHue() { @@ -78,4 +78,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Townfolk/Prisoner.cs b/Scripts/Mobiles/Townfolk/Prisoner.cs index 9f5087b52..525410096 100644 --- a/Scripts/Mobiles/Townfolk/Prisoner.cs +++ b/Scripts/Mobiles/Townfolk/Prisoner.cs @@ -15,8 +15,8 @@ namespace Server.Mobiles.Townfolk IsPrisoner = true; } - public override bool CanTeach { get { return true; } } - public override bool ClickTitle { get { return false; } } + public override bool CanTeach => true; + public override bool ClickTitle => false; public override void InitOutfit() { diff --git a/Scripts/Mobiles/Townfolk/Samurai.cs b/Scripts/Mobiles/Townfolk/Samurai.cs index 41cf6f5be..5a1283201 100644 --- a/Scripts/Mobiles/Townfolk/Samurai.cs +++ b/Scripts/Mobiles/Townfolk/Samurai.cs @@ -6,8 +6,8 @@ namespace Server.Mobiles { public class Samurai : BaseCreature { - public override bool CanTeach{ get{ return true; } } - public override bool ClickTitle{ get{ return false; } } + public override bool CanTeach => true; + public override bool ClickTitle => false; [Constructible] public Samurai() : base( AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) diff --git a/Scripts/Mobiles/Townfolk/Sculptor.cs b/Scripts/Mobiles/Townfolk/Sculptor.cs index 9c7dc4fd2..32d209abe 100644 --- a/Scripts/Mobiles/Townfolk/Sculptor.cs +++ b/Scripts/Mobiles/Townfolk/Sculptor.cs @@ -46,7 +46,7 @@ namespace Server.Mobiles AddItem( pack ); } - public override bool ClickTitle { get { return false; } } + public override bool ClickTitle => false; public Sculptor( Serial serial ) : base( serial ) @@ -57,7 +57,7 @@ namespace Server.Mobiles { base.Serialize( writer ); - writer.Write( (int)0 ); // version + writer.Write( (int)0 ); // version } public override void Deserialize( GenericReader reader ) diff --git a/Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs b/Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs index 6391a23a4..865e2ed64 100644 --- a/Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs +++ b/Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs @@ -34,7 +34,7 @@ namespace Server.Mobiles Title = "the seeker of adventure"; } - public override bool ClickTitle{ get{ return false; } } // Do not display 'the seeker of adventure' when single-clicking + public override bool ClickTitle => false; // Do not display 'the seeker of adventure' when single-clicking private static int GetRandomHue() { @@ -96,4 +96,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/BaseVendor.cs b/Scripts/Mobiles/Vendors/BaseVendor.cs index 7d573910c..28a46a20b 100644 --- a/Scripts/Mobiles/Vendors/BaseVendor.cs +++ b/Scripts/Mobiles/Vendors/BaseVendor.cs @@ -34,11 +34,11 @@ namespace Server.Mobiles private DateTime m_NextTrickOrTreat; - public override bool CanTeach { get { return true; } } + public override bool CanTeach => true; - public override bool BardImmune { get { return true; } } + public override bool BardImmune => true; - public override bool PlayerRangeSensitive { get { return true; } } + public override bool PlayerRangeSensitive => true; public virtual bool IsActiveVendor { get { return true; } } public virtual bool IsActiveBuyer { get { return IsActiveVendor; } } // response to vendor SELL @@ -46,11 +46,11 @@ namespace Server.Mobiles public virtual NpcGuild NpcGuild { get { return NpcGuild.None; } } - public override bool IsInvulnerable { get { return true; } } + public override bool IsInvulnerable => true; public virtual DateTime NextTrickOrTreat { get { return m_NextTrickOrTreat; } set { m_NextTrickOrTreat = value; } } - public override bool ShowFameTitle { get { return false; } } + public override bool ShowFameTitle => false; public virtual bool IsValidBulkOrder( Item item ) { @@ -1398,7 +1398,7 @@ namespace Server.Mobiles { if ( SupportsBulkOrders( from ) ) list.Add( new BulkOrderInfoEntry( from, this ) ); - + if ( IsActiveSeller ) list.Add( new VendorBuyEntry( from, this ) ); diff --git a/Scripts/Mobiles/Vendors/BeverageBuy.cs b/Scripts/Mobiles/Vendors/BeverageBuy.cs index f82e32be0..32df640fe 100644 --- a/Scripts/Mobiles/Vendors/BeverageBuy.cs +++ b/Scripts/Mobiles/Vendors/BeverageBuy.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles { private BeverageType m_Content; - public override bool CanCacheDisplay{ get{ return false; } } + public override bool CanCacheDisplay => false; public BeverageBuyInfo( Type type, BeverageType content, int price, int amount, int itemID, int hue ) : this( null, type, content, price, amount, itemID, hue ) { @@ -31,4 +31,4 @@ namespace Server.Mobiles return (IEntity)Activator.CreateInstance( Type, new object[]{ m_Content } ); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs b/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs index 44fb12a7e..cd07d55b4 100644 --- a/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs +++ b/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs @@ -13,10 +13,10 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override bool ClickTitle{ get{ return false; } } + public override bool ClickTitle => false; - public override bool IsActiveBuyer{ get{ return false; } } - public override bool IsActiveSeller{ get{ return true; } } + public override bool IsActiveBuyer => false; + public override bool IsActiveSeller => true; public override bool OnBuyItems( Mobile buyer, List list ) { @@ -585,4 +585,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs index 4dad18648..b8cbebf93 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs @@ -11,9 +11,9 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override bool IsActiveVendor{ get{ return false; } } + public override bool IsActiveVendor => false; - public override bool ClickTitle{ get{ return false; } } + public override bool ClickTitle => false; public virtual int JoinCost{ get{ return 500; } } @@ -164,4 +164,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs index d80937604..18d7ea24a 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs @@ -8,9 +8,9 @@ namespace Server.Mobiles { public override NpcGuild NpcGuild{ get{ return NpcGuild.BlacksmithsGuild; } } - public override bool IsActiveVendor{ get{ return true; } } + public override bool IsActiveVendor => true; - public override bool ClickTitle{ get{ return true; } } + public override bool ClickTitle => true; [Constructible] public BlacksmithGuildmaster() : base( "blacksmith" ) @@ -67,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs b/Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs index df7ef17a4..4f527e7c2 100644 --- a/Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs +++ b/Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs @@ -11,9 +11,9 @@ namespace Server.Mobiles { public class GypsyBanker : Banker { - public override bool IsActiveVendor{ get{ return false; } } + public override bool IsActiveVendor => false; public override NpcGuild NpcGuild{ get{ return NpcGuild.None; } } - public override bool ClickTitle{ get{ return false; } } + public override bool ClickTitle => false; [Constructible] public GypsyBanker() @@ -86,4 +86,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs b/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs index 43ed9c0b5..546ed8eba 100644 --- a/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs +++ b/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs @@ -174,11 +174,11 @@ namespace Server.Mobiles set{ m_TipMessage = value; } } - public override bool IsActiveBuyer{ get{ return false; } } - public override bool IsActiveSeller{ get{ return ( m_SBInfos.Count > 0 ); } } + public override bool IsActiveBuyer => false; + public override bool IsActiveSeller => ( m_SBInfos.Count > 0 ); - public override bool DisallowAllMoves{ get{ return true; } } - public override bool NoHouseRestrictions{ get{ return true; } } + public override bool DisallowAllMoves => true; + public override bool NoHouseRestrictions => true; public BarkeeperRumor[] Rumors{ get{ return m_Rumors; } } @@ -488,8 +488,8 @@ namespace Server.Mobiles } } - private List m_SBInfos = new List(); - protected override List SBInfos{ get { return m_SBInfos; } } + private List m_SBInfos = new List(); + protected override List SBInfos{ get { return m_SBInfos; } } public override void InitSBInfo() { @@ -974,7 +974,7 @@ namespace Server.Mobiles AddButton( 130, 120, 4005, 4007, GetButtonID( 5, 0 ), GumpButtonType.Reply, 0 ); AddHtml( 170, 120, 120, 20, "Title", false, false ); - if ( m_Barkeeper.BodyValue != 0x340 && m_Barkeeper.BodyValue != 0x402 ) { + if ( m_Barkeeper.BodyValue != 0x340 && m_Barkeeper.BodyValue != 0x402 ) { AddButton( 130, 200, 4005, 4007, GetButtonID( 5, 1 ), GumpButtonType.Reply, 0 ); AddHtml( 170, 200, 120, 20, "Appearance", false, false ); @@ -1069,4 +1069,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/PlayerVendor.cs b/Scripts/Mobiles/Vendors/PlayerVendor.cs index 0ee269b92..cd3aeffb3 100644 --- a/Scripts/Mobiles/Vendors/PlayerVendor.cs +++ b/Scripts/Mobiles/Vendors/PlayerVendor.cs @@ -178,7 +178,7 @@ namespace Server.Mobiles m_Item = item; } - public override bool NonLocalUse{ get{ return true; } } + public override bool NonLocalUse => true; public override void OnClick() { @@ -405,7 +405,7 @@ namespace Server.Mobiles } } - break; + break; } } @@ -554,7 +554,7 @@ namespace Server.Mobiles public PlayerVendorPlaceholder Placeholder { - get{ return m_Placeholder; } + get{ return m_Placeholder; } set{ m_Placeholder = value; } } @@ -576,7 +576,7 @@ namespace Server.Mobiles public int ChargePerDay { get - { + { if ( BaseHouse.NewVendorSystem ) { return ChargePerRealWorldDay / 12; @@ -657,7 +657,7 @@ namespace Server.Mobiles FixDresswear(); /* Possible cases regarding item return: - * + * * 1. No item must be returned * -> do nothing. * 2. ( toBackpack is false OR the vendor is in the internal map ) AND the vendor is associated with a AOS house @@ -1302,7 +1302,7 @@ namespace Server.Mobiles e.Handled = true; } - } + } else if ( e.HasKeyword( 0x3D ) || (e.HasKeyword( 0x172 ) && WasNamed( e.Speech )) ) // vendor browse, *browse { if ( House != null && House.IsBanned( from ) && !IsOwner( from ) ) @@ -1316,14 +1316,14 @@ namespace Server.Mobiles else { IPooledEnumerable mobiles = e.Mobile.GetMobilesInRange( 2 ); - + foreach ( PlayerVendor m in mobiles ) if ( m.CanSee( e.Mobile ) && m.InLOS( e.Mobile ) ) m.OpenBackpack( from ); - + mobiles.Free(); } - + e.Handled = true; } } @@ -1346,7 +1346,7 @@ namespace Server.Mobiles } else { - SayTo( from, 503226 ); // What do you care? You don't run this shop. + SayTo( from, 503226 ); // What do you care? You don't run this shop. } } else if ( e.HasKeyword( 0x40 ) || (e.HasKeyword( 0x175 ) && WasNamed( e.Speech )) ) // vendor dismiss, *dismiss diff --git a/Scripts/Mobiles/Vendors/PresetMapBuy.cs b/Scripts/Mobiles/Vendors/PresetMapBuy.cs index 99ad1a050..932188270 100644 --- a/Scripts/Mobiles/Vendors/PresetMapBuy.cs +++ b/Scripts/Mobiles/Vendors/PresetMapBuy.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles { private PresetMapEntry m_Entry; - public override bool CanCacheDisplay{ get{ return false; } } + public override bool CanCacheDisplay => false; public PresetMapBuyInfo( PresetMapEntry entry, int price, int amount ) : base( entry.Name.ToString(), null, price, amount, 0x14EC, 0 ) { @@ -20,4 +20,4 @@ namespace Server.Mobiles return new PresetMap( m_Entry ); } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/Boats/BaseBoat.cs b/Scripts/Multis/Boats/BaseBoat.cs index 7f24ec05d..fa1c90df9 100644 --- a/Scripts/Multis/Boats/BaseBoat.cs +++ b/Scripts/Multis/Boats/BaseBoat.cs @@ -972,7 +972,7 @@ namespace Server.Multis return true; } - public override bool HandlesOnSpeech{ get{ return true; } } + public override bool HandlesOnSpeech => true; public override void OnSpeech( SpeechEventArgs e ) { diff --git a/Scripts/Multis/Camps/BaseCamp.cs b/Scripts/Multis/Camps/BaseCamp.cs index f3849208c..01bae279a 100644 --- a/Scripts/Multis/Camps/BaseCamp.cs +++ b/Scripts/Multis/Camps/BaseCamp.cs @@ -22,12 +22,12 @@ namespace Server.Multis get { return m_DecayDelay; - } + } set { m_DecayDelay = value; RefreshDecay( true ); - } + } } public BaseCamp( int multiID ) : base( multiID ) @@ -44,7 +44,7 @@ namespace Server.Multis { if ( Deleted ) return; - + AddComponents(); } @@ -84,8 +84,8 @@ namespace Server.Multis if ( bc != null ) { - bc.RangeHome = wanderRange; - bc.Home = loc; + bc.RangeHome = wanderRange; + bc.Home = loc; } if ( m is BaseVendor || m is Banker ) @@ -104,7 +104,7 @@ namespace Server.Multis RefreshDecay( true ); } - public override bool HandlesOnMovement{ get{ return true; } } + public override bool HandlesOnMovement => true; public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -204,4 +204,4 @@ namespace Server.Multis Weight = 1.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/HouseFoundation.cs b/Scripts/Multis/HouseFoundation.cs index 106c8acd1..90e27fa09 100644 --- a/Scripts/Multis/HouseFoundation.cs +++ b/Scripts/Multis/HouseFoundation.cs @@ -48,7 +48,7 @@ namespace Server.Multis public int SignpostGraphic { get { return m_SignpostGraphic; } set { m_SignpostGraphic = value; } } public Mobile Customizer { get { return m_Customizer; } set { m_Customizer = value; } } - public override bool IsAosRules { get { return true; } } + public override bool IsAosRules => true; public override bool IsActive { get { return Customizer == null; } } @@ -2521,4 +2521,4 @@ namespace Server.Multis m_Sync.Set(); } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/HouseSign.cs b/Scripts/Multis/HouseSign.cs index 9b1e3fea9..4988210dc 100644 --- a/Scripts/Multis/HouseSign.cs +++ b/Scripts/Multis/HouseSign.cs @@ -69,7 +69,7 @@ namespace Server.Multis list.Add( 1061638 ); // A House Sign } - public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; private bool m_GettingProperties; @@ -303,4 +303,4 @@ namespace Server.Multis this.Name = null; } } -} \ No newline at end of file +} diff --git a/Scripts/Regions/DungeonRegion.cs b/Scripts/Regions/DungeonRegion.cs index 3d907f568..881187076 100644 --- a/Scripts/Regions/DungeonRegion.cs +++ b/Scripts/Regions/DungeonRegion.cs @@ -8,7 +8,7 @@ namespace Server.Regions { public class DungeonRegion : BaseRegion { - public override bool YoungProtected { get { return false; } } + public override bool YoungProtected => false; private Point3D m_EntranceLocation; private Map m_EntranceMap; @@ -45,4 +45,4 @@ namespace Server.Regions return base.CanUseStuckMenu( m ); } } -} \ No newline at end of file +} diff --git a/Scripts/Regions/Spawning/SpawnDefinition.cs b/Scripts/Regions/Spawning/SpawnDefinition.cs index 16314d4b6..ca9e0cfe8 100644 --- a/Scripts/Regions/Spawning/SpawnDefinition.cs +++ b/Scripts/Regions/Spawning/SpawnDefinition.cs @@ -224,8 +224,8 @@ namespace Server.Regions protected int m_Height; public override int Height{ get{ EnsureInit(); return m_Height; } } - public override bool Land{ get{ return true; } } - public override bool Water{ get{ return false; } } + public override bool Land => true; + public override bool Water => false; protected SpawnItem( Type type ) : base( type ) { diff --git a/Scripts/Skills/SpiritSpeak.cs b/Scripts/Skills/SpiritSpeak.cs index ed0ea71b9..3c0573e08 100644 --- a/Scripts/Skills/SpiritSpeak.cs +++ b/Scripts/Skills/SpiritSpeak.cs @@ -30,7 +30,7 @@ namespace Server.SkillHandlers m.RevealingAction(); if ( m.CheckSkill( SkillName.SpiritSpeak, 0, 100 ) ) - { + { if ( !m.CanHearGhosts ) { Timer t = new SpiritSpeakTimer( m ); @@ -76,13 +76,13 @@ namespace Server.SkillHandlers { private static SpellInfo m_Info = new SpellInfo( "Spirit Speak", "", 269 ); - public override bool BlockedByHorrificBeast{ get{ return false; } } + public override bool BlockedByHorrificBeast => false; public SpiritSpeakSpell( Mobile caster ) : base( caster, null, m_Info ) { } - public override bool ClearHandsOnCast{ get{ return false; } } + public override bool ClearHandsOnCast => false; public override double CastDelayFastScalar { get { return 0; } } public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } } @@ -108,7 +108,7 @@ namespace Server.SkillHandlers return true; } - public override bool CheckNextSpellTime{ get{ return false; } } + public override bool CheckNextSpellTime => false; public override void OnDisturb( DisturbType type, bool message ) { @@ -198,4 +198,4 @@ namespace Server.SkillHandlers } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Bushido/LightningStrike.cs b/Scripts/Spells/Bushido/LightningStrike.cs index 50662e982..6f4352c23 100644 --- a/Scripts/Spells/Bushido/LightningStrike.cs +++ b/Scripts/Spells/Bushido/LightningStrike.cs @@ -18,7 +18,7 @@ namespace Server.Spells.Bushido public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063167 ); } } // You prepare to strike quickly. - public override bool DelayedContext{ get{ return true; } } + public override bool DelayedContext => true; public override int GetAccuracyBonus( Mobile attacker ) { @@ -50,7 +50,7 @@ namespace Server.Spells.Bushido return Validate(attacker); } - public override bool ValidatesDuringHit { get { return false; } } + public override bool ValidatesDuringHit => false; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -68,7 +68,7 @@ namespace Server.Spells.Bushido public override void OnClearMove( Mobile attacker ) { - PlayerMobile ThePlayer = attacker as PlayerMobile; // this can be deletet if the PlayerMobile parts are moved to Server.Mobile + PlayerMobile ThePlayer = attacker as PlayerMobile; // this can be deletet if the PlayerMobile parts are moved to Server.Mobile ThePlayer.ExecutesLightningStrike = 0; } } diff --git a/Scripts/Spells/Bushido/SamuraiSpell.cs b/Scripts/Spells/Bushido/SamuraiSpell.cs index 850f2a86d..e739d0e1a 100644 --- a/Scripts/Spells/Bushido/SamuraiSpell.cs +++ b/Scripts/Spells/Bushido/SamuraiSpell.cs @@ -15,9 +15,9 @@ namespace Server.Spells.Bushido public override SkillName CastSkill{ get{ return SkillName.Bushido; } } public override SkillName DamageSkill{ get{ return SkillName.Bushido; } } - public override bool ClearHandsOnCast{ get{ return false; } } - public override bool BlocksMovement{ get{ return false; } } - public override bool ShowHandMovement{ get{ return false; } } + public override bool ClearHandsOnCast => false; + public override bool BlocksMovement => false; + public override bool ShowHandMovement => false; //public override int CastDelayBase{ get{ return 1; } } public override double CastDelayFastScalar{ get{ return 0; } } @@ -126,4 +126,4 @@ namespace Server.Spells.Bushido caster.Send( new ToggleSpecialAbility( spellID + 1, false ) ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Chivalry/ConsecrateWeapon.cs b/Scripts/Spells/Chivalry/ConsecrateWeapon.cs index db592fc1b..782fb246a 100644 --- a/Scripts/Spells/Chivalry/ConsecrateWeapon.cs +++ b/Scripts/Spells/Chivalry/ConsecrateWeapon.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Chivalry public override int RequiredMana{ get{ return 10; } } public override int RequiredTithing{ get{ return 10; } } public override int MantraNumber{ get{ return 1060720; } } // Consecrus Arma - public override bool BlocksMovement{ get{ return false; } } + public override bool BlocksMovement => false; public ConsecrateWeaponSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -104,4 +104,4 @@ namespace Server.Spells.Chivalry } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Chivalry/DispelEvil.cs b/Scripts/Spells/Chivalry/DispelEvil.cs index abb7bb02d..b7064d079 100644 --- a/Scripts/Spells/Chivalry/DispelEvil.cs +++ b/Scripts/Spells/Chivalry/DispelEvil.cs @@ -22,13 +22,13 @@ namespace Server.Spells.Chivalry public override int RequiredMana{ get{ return 10; } } public override int RequiredTithing{ get{ return 10; } } public override int MantraNumber{ get{ return 1060721; } } // Dispiro Malas - public override bool BlocksMovement{ get{ return false; } } + public override bool BlocksMovement => false; public DispelEvilSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { } - public override bool DelayedDamage{ get{ return false; } } + public override bool DelayedDamage => false; public override void SendCastEffect() { @@ -46,7 +46,7 @@ namespace Server.Spells.Chivalry if ( Caster != m && SpellHelper.ValidIndirectTarget( Caster, m ) && Caster.CanBeHarmful( m, false ) ) targets.Add( m ); } - + Caster.PlaySound( 0xF5 ); Caster.PlaySound( 0x299 ); Caster.FixedParticles( 0x37C4, 1, 25, 9922, 14, 3, EffectLayer.Head ); @@ -116,4 +116,4 @@ namespace Server.Spells.Chivalry FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Chivalry/DivineFury.cs b/Scripts/Spells/Chivalry/DivineFury.cs index 6c5d1d902..77302205e 100644 --- a/Scripts/Spells/Chivalry/DivineFury.cs +++ b/Scripts/Spells/Chivalry/DivineFury.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Chivalry public override int RequiredMana{ get{ return 15; } } public override int RequiredTithing{ get{ return 10; } } public override int MantraNumber{ get{ return 1060722; } } // Divinum Furis - public override bool BlocksMovement{ get{ return false; } } + public override bool BlocksMovement => false; public DivineFurySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -76,4 +76,4 @@ namespace Server.Spells.Chivalry m.PlaySound( 0xF8 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Chivalry/EnemyOfOne.cs b/Scripts/Spells/Chivalry/EnemyOfOne.cs index f6a809ef3..7cf55e9e3 100644 --- a/Scripts/Spells/Chivalry/EnemyOfOne.cs +++ b/Scripts/Spells/Chivalry/EnemyOfOne.cs @@ -22,7 +22,7 @@ namespace Server.Spells.Chivalry public override int RequiredMana{ get{ return 20; } } public override int RequiredTithing{ get{ return 10; } } public override int MantraNumber{ get{ return 1060723; } } // Forul Solum - public override bool BlocksMovement{ get{ return false; } } + public override bool BlocksMovement => false; public EnemyOfOneSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -81,4 +81,4 @@ namespace Server.Spells.Chivalry } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Chivalry/HolyLight.cs b/Scripts/Spells/Chivalry/HolyLight.cs index 212ed0542..1946bdccf 100644 --- a/Scripts/Spells/Chivalry/HolyLight.cs +++ b/Scripts/Spells/Chivalry/HolyLight.cs @@ -20,13 +20,13 @@ namespace Server.Spells.Chivalry public override int RequiredMana{ get{ return 10; } } public override int RequiredTithing{ get{ return 10; } } public override int MantraNumber{ get{ return 1060724; } } // Augus Luminos - public override bool BlocksMovement{ get{ return false; } } + public override bool BlocksMovement => false; public HolyLightSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { } - public override bool DelayedDamage{ get{ return false; } } + public override bool DelayedDamage => false; public override void OnCast() { @@ -64,4 +64,4 @@ namespace Server.Spells.Chivalry FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Chivalry/NobleSacrifice.cs b/Scripts/Spells/Chivalry/NobleSacrifice.cs index 169b585e5..5c3842e50 100644 --- a/Scripts/Spells/Chivalry/NobleSacrifice.cs +++ b/Scripts/Spells/Chivalry/NobleSacrifice.cs @@ -26,7 +26,7 @@ namespace Server.Spells.Chivalry public override int RequiredMana{ get{ return 20; } } public override int RequiredTithing{ get{ return 30; } } public override int MantraNumber{ get{ return 1060725; } } // Dium Prostra - public override bool BlocksMovement{ get{ return false; } } + public override bool BlocksMovement => false; public NobleSacrificeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -171,4 +171,4 @@ namespace Server.Spells.Chivalry FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Chivalry/PaladinSpell.cs b/Scripts/Spells/Chivalry/PaladinSpell.cs index 6b896df90..ff664eeb8 100644 --- a/Scripts/Spells/Chivalry/PaladinSpell.cs +++ b/Scripts/Spells/Chivalry/PaladinSpell.cs @@ -15,7 +15,7 @@ namespace Server.Spells.Chivalry public override SkillName CastSkill{ get{ return SkillName.Chivalry; } } public override SkillName DamageSkill{ get{ return SkillName.Chivalry; } } - public override bool ClearHandsOnCast{ get{ return false; } } + public override bool ClearHandsOnCast => false; //public override int CastDelayBase{ get{ return 1; } } diff --git a/Scripts/Spells/Chivalry/SacredJourney.cs b/Scripts/Spells/Chivalry/SacredJourney.cs index b3218254c..642c10f8e 100644 --- a/Scripts/Spells/Chivalry/SacredJourney.cs +++ b/Scripts/Spells/Chivalry/SacredJourney.cs @@ -22,7 +22,7 @@ namespace Server.Spells.Chivalry public override int RequiredMana{ get{ return 10; } } public override int RequiredTithing{ get{ return 15; } } public override int MantraNumber{ get{ return 1060727; } } // Sanctum Viatas - public override bool BlocksMovement{ get{ return false; } } + public override bool BlocksMovement => false; private RunebookEntry m_Entry; private Runebook m_Book; @@ -188,7 +188,7 @@ namespace Server.Spells.Chivalry from.Send( new MessageLocalized( from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 502357, from.Name, "" ) ); // I can not recall from that object. } } - + protected override void OnNonlocalTarget( Mobile from, object o ) { } @@ -199,4 +199,4 @@ namespace Server.Spells.Chivalry } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Eighth/Earthquake.cs b/Scripts/Spells/Eighth/Earthquake.cs index 72f2f6a56..7f895009e 100644 --- a/Scripts/Spells/Eighth/Earthquake.cs +++ b/Scripts/Spells/Eighth/Earthquake.cs @@ -25,7 +25,7 @@ namespace Server.Spells.Eighth { } - public override bool DelayedDamage{ get{ return !Core.AOS; } } + public override bool DelayedDamage => !Core.AOS; public override void OnCast() { @@ -75,4 +75,4 @@ namespace Server.Spells.Eighth FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fifth/MindBlast.cs b/Scripts/Spells/Fifth/MindBlast.cs index 3243408b6..df52dc13f 100644 --- a/Scripts/Spells/Fifth/MindBlast.cs +++ b/Scripts/Spells/Fifth/MindBlast.cs @@ -46,7 +46,7 @@ namespace Server.Spells.Fifth } } - public override bool DelayedDamage{ get{ return !Core.AOS; } } + public override bool DelayedDamage => !Core.AOS; public void Target( Mobile m ) { @@ -101,11 +101,11 @@ namespace Server.Spells.Fifth if ( highestStat > 150 ) highestStat = 150; - if ( lowestStat > 150 ) + if ( lowestStat > 150 ) lowestStat = 150; double damage = GetDamageScalar(m)*(highestStat - lowestStat) / 2; // Many users prefer 3 or 4 - + if ( damage > 45 ) damage = 45; diff --git a/Scripts/Spells/Fifth/PoisonField.cs b/Scripts/Spells/Fifth/PoisonField.cs index 1dc1fcb99..368317cae 100644 --- a/Scripts/Spells/Fifth/PoisonField.cs +++ b/Scripts/Spells/Fifth/PoisonField.cs @@ -91,7 +91,7 @@ namespace Server.Spells.Fifth private DateTime m_End; private Mobile m_Caster; - public override bool BlocksFit{ get{ return true; } } + public override bool BlocksFit => true; public InternalItem( int itemID, Point3D loc, Mobile caster, Map map, TimeSpan duration, int val ) : base( itemID ) { diff --git a/Scripts/Spells/First/MagicArrow.cs b/Scripts/Spells/First/MagicArrow.cs index 48f99b5eb..b1a22dc14 100644 --- a/Scripts/Spells/First/MagicArrow.cs +++ b/Scripts/Spells/First/MagicArrow.cs @@ -26,7 +26,7 @@ namespace Server.Spells.First Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage{ get{ return true; } } + public override bool DelayedDamage => true; public void Target( Mobile m ) { @@ -43,7 +43,7 @@ namespace Server.Spells.First SpellHelper.CheckReflect( (int)this.Circle, ref source, ref m ); double damage; - + if ( Core.AOS ) { damage = GetNewAosDamage( 10, 1, 4, m ); @@ -94,4 +94,4 @@ namespace Server.Spells.First } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fourth/FireField.cs b/Scripts/Spells/Fourth/FireField.cs index 387406d33..0a92972df 100644 --- a/Scripts/Spells/Fourth/FireField.cs +++ b/Scripts/Spells/Fourth/FireField.cs @@ -97,7 +97,7 @@ namespace Server.Spells.Fourth private Mobile m_Caster; private int m_Damage; - public override bool BlocksFit{ get{ return true; } } + public override bool BlocksFit => true; public FireFieldItem( int itemID, Point3D loc, Mobile caster, Map map, TimeSpan duration, int val ) : this( itemID, loc, caster, map, duration, val, 2 ) @@ -187,7 +187,7 @@ namespace Server.Spells.Fourth { if ( SpellHelper.CanRevealCaster( m ) ) m_Caster.RevealingAction(); - + m_Caster.DoHarmful( m ); int damage = m_Damage; @@ -264,7 +264,7 @@ namespace Server.Spells.Fourth while ( m_Queue.Count > 0 ) { Mobile m = (Mobile)m_Queue.Dequeue(); - + if ( SpellHelper.CanRevealCaster( m ) ) caster.RevealingAction(); @@ -312,4 +312,4 @@ namespace Server.Spells.Fourth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fourth/Lightning.cs b/Scripts/Spells/Fourth/Lightning.cs index 054a29805..c7e8e0f5d 100644 --- a/Scripts/Spells/Fourth/Lightning.cs +++ b/Scripts/Spells/Fourth/Lightning.cs @@ -25,7 +25,7 @@ namespace Server.Spells.Fourth Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage{ get{ return false; } } + public override bool DelayedDamage => false; public void Target( Mobile m ) { @@ -88,4 +88,4 @@ namespace Server.Spells.Fourth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/Exorcism.cs b/Scripts/Spells/Necromancy/Exorcism.cs index 7041da8ca..1fe6e6232 100644 --- a/Scripts/Spells/Necromancy/Exorcism.cs +++ b/Scripts/Spells/Necromancy/Exorcism.cs @@ -41,7 +41,7 @@ namespace Server.Spells.Necromancy } - public override bool DelayedDamage { get { return false; } } + public override bool DelayedDamage => false; private static readonly int Range = (Core.ML ? 48 : 18); @@ -198,4 +198,4 @@ namespace Server.Spells.Necromancy new Point3D( 295, 712, 55 ) }; } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/NecromancerSpell.cs b/Scripts/Spells/Necromancy/NecromancerSpell.cs index af21e28ba..c2647331f 100644 --- a/Scripts/Spells/Necromancy/NecromancerSpell.cs +++ b/Scripts/Spells/Necromancy/NecromancerSpell.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Necromancy //public override int CastDelayBase{ get{ return base.CastDelayBase; } } // Reference, 3 - public override bool ClearHandsOnCast{ get{ return false; } } + public override bool ClearHandsOnCast => false; public override double CastDelayFastScalar{ get{ return (Core.SE? base.CastDelayFastScalar : 0); } } // Necromancer spells are not affected by fast cast items, though they are by fast cast recovery @@ -56,4 +56,4 @@ namespace Server.Spells.Necromancy return RequiredMana; } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/PainSpike.cs b/Scripts/Spells/Necromancy/PainSpike.cs index ee51e2b28..b0771d6b3 100644 --- a/Scripts/Spells/Necromancy/PainSpike.cs +++ b/Scripts/Spells/Necromancy/PainSpike.cs @@ -30,7 +30,7 @@ namespace Server.Spells.Necromancy Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage{ get{ return false; } } + public override bool DelayedDamage => false; public void Target( Mobile m ) { @@ -41,7 +41,7 @@ namespace Server.Spells.Necromancy //SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); //Irrelevent asfter AoS /* Temporarily causes intense physical pain to the target, dealing direct damage. - * After 10 seconds the spell wears off, and if the target is still alive, + * After 10 seconds the spell wears off, and if the target is still alive, * some of the Hit Points lost through Pain Spike are restored. */ @@ -137,4 +137,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/PoisonStrike.cs b/Scripts/Spells/Necromancy/PoisonStrike.cs index c82556d85..a69a97f1a 100644 --- a/Scripts/Spells/Necromancy/PoisonStrike.cs +++ b/Scripts/Spells/Necromancy/PoisonStrike.cs @@ -31,7 +31,7 @@ namespace Server.Spells.Necromancy Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage { get { return false; } } + public override bool DelayedDamage => false; public void Target( Mobile m ) { @@ -50,10 +50,10 @@ namespace Server.Spells.Necromancy Effects.PlaySound( m.Location, m.Map, 0x229 ); double damage = Utility.RandomMinMax( (Core.ML ? 32 : 36), 40 ) * ((300 + (GetDamageSkill( Caster ) * 9)) / 1000); - + double sdiBonus = (double)AosAttributes.GetValue( Caster, AosAttribute.SpellDamage )/100; double pvmDamage = damage * (1 + sdiBonus); - + if ( Core.ML && sdiBonus > 0.15 ) sdiBonus = 0.15; double pvpDamage = damage * (1 + sdiBonus); @@ -63,7 +63,7 @@ namespace Server.Spells.Necromancy if( map != null ) { List targets = new List(); - + if ( Caster.CanBeHarmful(m, false ) ) targets.Add( m ); @@ -115,4 +115,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/TransformationSpell.cs b/Scripts/Spells/Necromancy/TransformationSpell.cs index 7dd9679ea..e3072284e 100644 --- a/Scripts/Spells/Necromancy/TransformationSpell.cs +++ b/Scripts/Spells/Necromancy/TransformationSpell.cs @@ -22,7 +22,7 @@ namespace Server.Spells.Necromancy { } - public override bool BlockedByHorrificBeast{ get{ return false; } } + public override bool BlockedByHorrificBeast => false; public override bool CheckCast() { @@ -53,4 +53,4 @@ namespace Server.Spells.Necromancy { } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/Wither.cs b/Scripts/Spells/Necromancy/Wither.cs index 210291f61..3bebcd188 100644 --- a/Scripts/Spells/Necromancy/Wither.cs +++ b/Scripts/Spells/Necromancy/Wither.cs @@ -27,7 +27,7 @@ namespace Server.Spells.Necromancy { } - public override bool DelayedDamage { get { return false; } } + public override bool DelayedDamage => false; public override void OnCast() { @@ -87,7 +87,7 @@ namespace Server.Spells.Necromancy int sdiBonus = AosAttributes.GetValue( Caster, AosAttribute.SpellDamage ); - // PvP spell damage increase cap of 15% from an item’s magic property in Publish 33(SE) + // PvP spell damage increase cap of 15% from an item�s magic property in Publish 33(SE) if( Core.SE && m.Player && Caster.Player && sdiBonus > 15 ) sdiBonus = 15; @@ -106,4 +106,4 @@ namespace Server.Spells.Necromancy FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Ninjitsu/AnimalForm.cs b/Scripts/Spells/Ninjitsu/AnimalForm.cs index 648838318..dfe0bc299 100644 --- a/Scripts/Spells/Ninjitsu/AnimalForm.cs +++ b/Scripts/Spells/Ninjitsu/AnimalForm.cs @@ -36,7 +36,7 @@ namespace Server.Spells.Ninjitsu public override int RequiredMana { get { return (Core.ML ? 10 : 0); } } public override int CastRecoveryBase { get { return (Core.ML ? 10 : base.CastRecoveryBase); } } - public override bool BlockedByAnimalForm { get { return false; } } + public override bool BlockedByAnimalForm => false; public AnimalForm(Mobile caster, Item scroll) : base(caster, scroll, m_Info) @@ -616,4 +616,4 @@ namespace Server.Spells.Ninjitsu } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Ninjitsu/Backstab.cs b/Scripts/Spells/Ninjitsu/Backstab.cs index 66576eddb..31eef4962 100644 --- a/Scripts/Spells/Ninjitsu/Backstab.cs +++ b/Scripts/Spells/Ninjitsu/Backstab.cs @@ -51,17 +51,17 @@ namespace Server.Spells.Ninjitsu } - public override bool ValidatesDuringHit { get { return false; } } + public override bool ValidatesDuringHit => false; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { //Validates before swing - + ClearCurrentMove( attacker ); attacker.SendLocalizedMessage( 1063090 ); // You quickly stab your opponent as you come out of hiding! - defender.FixedParticles( 0x37B9, 1, 5, 0x251D, 0x651, 0, EffectLayer.Waist ); + defender.FixedParticles( 0x37B9, 1, 5, 0x251D, 0x651, 0, EffectLayer.Waist ); attacker.RevealingAction(); @@ -77,4 +77,4 @@ namespace Server.Spells.Ninjitsu attacker.RevealingAction(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Ninjitsu/MirrorImage.cs b/Scripts/Spells/Ninjitsu/MirrorImage.cs index b4cf23cf7..a0ac32ec3 100644 --- a/Scripts/Spells/Ninjitsu/MirrorImage.cs +++ b/Scripts/Spells/Ninjitsu/MirrorImage.cs @@ -54,7 +54,7 @@ namespace Server.Spells.Ninjitsu public override double RequiredSkill{ get{ return Core.ML ? 20.0 : 40.0; } } public override int RequiredMana{ get{ return 10; } } - public override bool BlockedByAnimalForm{ get{ return false; } } + public override bool BlockedByAnimalForm => false; public MirrorImage( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -192,7 +192,7 @@ namespace Server.Mobiles Delete(); } - public override bool DeleteCorpseOnDeath { get { return true; } } + public override bool DeleteCorpseOnDeath => true; public override void OnDelete() { @@ -207,8 +207,8 @@ namespace Server.Mobiles base.OnAfterDelete(); } - public override bool IsDispellable { get { return false; } } - public override bool Commandable { get { return false; } } + public override bool IsDispellable => false; + public override bool Commandable => false; public Clone( Serial serial ) : base( serial ) { @@ -263,7 +263,7 @@ namespace Server.Mobiles return true; } - - public override bool CanDetectHidden { get { return false; } } + + public override bool CanDetectHidden => false; } } diff --git a/Scripts/Spells/Ninjitsu/NinjaSpell.cs b/Scripts/Spells/Ninjitsu/NinjaSpell.cs index d04ac8103..3712d7760 100644 --- a/Scripts/Spells/Ninjitsu/NinjaSpell.cs +++ b/Scripts/Spells/Ninjitsu/NinjaSpell.cs @@ -15,11 +15,11 @@ namespace Server.Spells.Ninjitsu public override SkillName CastSkill{ get{ return SkillName.Ninjitsu; } } public override SkillName DamageSkill{ get{ return SkillName.Ninjitsu; } } - public override bool RevealOnCast{ get{ return false; } } - public override bool ClearHandsOnCast{ get{ return false; } } - public override bool ShowHandMovement{ get{ return false; } } + public override bool RevealOnCast => false; + public override bool ClearHandsOnCast => false; + public override bool ShowHandMovement => false; - public override bool BlocksMovement{ get{ return false; } } + public override bool BlocksMovement => false; //public override int CastDelayBase{ get{ return 1; } } @@ -102,4 +102,4 @@ namespace Server.Spells.Ninjitsu return 0; } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Ninjitsu/ShadowJump.cs b/Scripts/Spells/Ninjitsu/ShadowJump.cs index 1d327fde7..6a73c8fe6 100644 --- a/Scripts/Spells/Ninjitsu/ShadowJump.cs +++ b/Scripts/Spells/Ninjitsu/ShadowJump.cs @@ -21,7 +21,7 @@ namespace Server.Spells.Ninjitsu public override double RequiredSkill{ get{ return 50.0; } } public override int RequiredMana{ get{ return 15; } } - public override bool BlockedByAnimalForm{ get{ return false; } } + public override bool BlockedByAnimalForm => false; public Shadowjump( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -101,7 +101,7 @@ namespace Server.Spells.Ninjitsu Effects.SendLocationParticles( EffectItem.Create( from, m.Map, EffectItem.DefaultDuration ), 0x3728, 10, 10, 2023 ); m.PlaySound( 0x512 ); - + Server.SkillHandlers.Stealth.OnUse( m ); // stealth check after the a jump } @@ -130,4 +130,4 @@ namespace Server.Spells.Ninjitsu } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Ninjitsu/SurpriseAttack.cs b/Scripts/Spells/Ninjitsu/SurpriseAttack.cs index 6a03f349c..7cf64db8b 100644 --- a/Scripts/Spells/Ninjitsu/SurpriseAttack.cs +++ b/Scripts/Spells/Ninjitsu/SurpriseAttack.cs @@ -44,7 +44,7 @@ namespace Server.Spells.Ninjitsu } - public override bool ValidatesDuringHit { get { return false; } } + public override bool ValidatesDuringHit => false; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -131,4 +131,4 @@ namespace Server.Spells.Ninjitsu m_Table.Remove( info.m_Target ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Second/Harm.cs b/Scripts/Spells/Second/Harm.cs index d5f5e2715..397840f31 100644 --- a/Scripts/Spells/Second/Harm.cs +++ b/Scripts/Spells/Second/Harm.cs @@ -25,7 +25,7 @@ namespace Server.Spells.Second Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage{ get{ return false; } } + public override bool DelayedDamage => false; public override double GetSlayerDamageScalar( Mobile target ) @@ -47,7 +47,7 @@ namespace Server.Spells.Second SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); double damage; - + if ( Core.AOS ) { damage = GetNewAosDamage( 17, 1, 5, m ); @@ -111,4 +111,4 @@ namespace Server.Spells.Second } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Seventh/ChainLightning.cs b/Scripts/Spells/Seventh/ChainLightning.cs index d6342405d..496028222 100644 --- a/Scripts/Spells/Seventh/ChainLightning.cs +++ b/Scripts/Spells/Seventh/ChainLightning.cs @@ -30,7 +30,7 @@ namespace Server.Spells.Seventh Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage{ get{ return true; } } + public override bool DelayedDamage => true; public void Target( IPoint3D p ) { diff --git a/Scripts/Spells/Seventh/EnergyField.cs b/Scripts/Spells/Seventh/EnergyField.cs index d0db67d7f..e538dcf03 100644 --- a/Scripts/Spells/Seventh/EnergyField.cs +++ b/Scripts/Spells/Seventh/EnergyField.cs @@ -102,7 +102,7 @@ namespace Server.Spells.Seventh private Timer m_Timer; private Mobile m_Caster; - public override bool BlocksFit{ get{ return true; } } + public override bool BlocksFit => true; public InternalItem( Point3D loc, Map map, TimeSpan duration, int itemID, Mobile caster ) : base( itemID ) { @@ -205,4 +205,4 @@ namespace Server.Spells.Seventh } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Seventh/FlameStrike.cs b/Scripts/Spells/Seventh/FlameStrike.cs index e2b1ffa6c..c8e0c7b73 100644 --- a/Scripts/Spells/Seventh/FlameStrike.cs +++ b/Scripts/Spells/Seventh/FlameStrike.cs @@ -25,7 +25,7 @@ namespace Server.Spells.Seventh Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage{ get{ return true; } } + public override bool DelayedDamage => true; public void Target( Mobile m ) { @@ -91,4 +91,4 @@ namespace Server.Spells.Seventh } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Seventh/GateTravel.cs b/Scripts/Spells/Seventh/GateTravel.cs index 198a4a413..3eacd7622 100644 --- a/Scripts/Spells/Seventh/GateTravel.cs +++ b/Scripts/Spells/Seventh/GateTravel.cs @@ -145,7 +145,7 @@ namespace Server.Spells.Seventh [DispellableField] private class InternalItem : Moongate { - public override bool ShowFeluccaWarning{ get{ return Core.AOS; } } + public override bool ShowFeluccaWarning => Core.AOS; public InternalItem( Point3D target, Map map ) : base( target, map ) { @@ -244,7 +244,7 @@ namespace Server.Spells.Seventh from.Send( new MessageLocalized( from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 501030, from.Name, "" ) ); // I can not gate travel from that object. } } - + protected override void OnNonlocalTarget( Mobile from, object o ) { } diff --git a/Scripts/Spells/Seventh/MeteorSwarm.cs b/Scripts/Spells/Seventh/MeteorSwarm.cs index e519db6c8..2c3aefd50 100644 --- a/Scripts/Spells/Seventh/MeteorSwarm.cs +++ b/Scripts/Spells/Seventh/MeteorSwarm.cs @@ -30,7 +30,7 @@ namespace Server.Spells.Seventh Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage{ get{ return true; } } + public override bool DelayedDamage => true; public void Target( IPoint3D p ) { @@ -87,7 +87,7 @@ namespace Server.Spells.Seventh damage = (damage * 2) / targets.Count; else if ( !Core.AOS ) damage /= targets.Count; - + double toDeal; for ( int i = 0; i < targets.Count; ++i ) { diff --git a/Scripts/Spells/Sixth/EnergyBolt.cs b/Scripts/Spells/Sixth/EnergyBolt.cs index 8a829ddbe..958b69aad 100644 --- a/Scripts/Spells/Sixth/EnergyBolt.cs +++ b/Scripts/Spells/Sixth/EnergyBolt.cs @@ -25,7 +25,7 @@ namespace Server.Spells.Sixth Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage{ get{ return true; } } + public override bool DelayedDamage => true; public void Target( Mobile m ) { @@ -94,4 +94,4 @@ namespace Server.Spells.Sixth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Sixth/Explosion.cs b/Scripts/Spells/Sixth/Explosion.cs index eb140af1c..3e0903147 100644 --- a/Scripts/Spells/Sixth/Explosion.cs +++ b/Scripts/Spells/Sixth/Explosion.cs @@ -28,7 +28,7 @@ namespace Server.Spells.Sixth Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage { get { return false; } } + public override bool DelayedDamage => false; public void Target( Mobile m ) { @@ -128,4 +128,4 @@ namespace Server.Spells.Sixth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Sixth/ParalyzeField.cs b/Scripts/Spells/Sixth/ParalyzeField.cs index a079647aa..db822942a 100644 --- a/Scripts/Spells/Sixth/ParalyzeField.cs +++ b/Scripts/Spells/Sixth/ParalyzeField.cs @@ -89,7 +89,7 @@ namespace Server.Spells.Sixth private Mobile m_Caster; private DateTime m_End; - public override bool BlocksFit{ get{ return true; } } + public override bool BlocksFit => true; public InternalItem( Mobile caster, int itemID, Point3D loc, Map map, TimeSpan duration ) : base( itemID ) { @@ -188,7 +188,7 @@ namespace Server.Spells.Sixth m.PlaySound( 0x204 ); m.FixedEffect( 0x376A, 10, 16 ); - + if ( m is BaseCreature ) ((BaseCreature) m).OnHarmfulSpell( m_Caster ); } @@ -234,4 +234,4 @@ namespace Server.Spells.Sixth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/ArcanistSpell.cs b/Scripts/Spells/Spellweaving/ArcanistSpell.cs index 22516d8ed..a3a4c1a78 100644 --- a/Scripts/Spells/Spellweaving/ArcanistSpell.cs +++ b/Scripts/Spells/Spellweaving/ArcanistSpell.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Spellweaving public override SkillName CastSkill { get { return SkillName.Spellweaving; } } public override SkillName DamageSkill { get { return SkillName.Spellweaving; } } - public override bool ClearHandsOnCast { get { return false; } } + public override bool ClearHandsOnCast => false; private int m_CastTimeFocusLevel; diff --git a/Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs b/Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs index 6659973da..59271eb24 100644 --- a/Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs +++ b/Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs @@ -37,7 +37,7 @@ namespace Server.Items public ArcaneFocus( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); @@ -46,7 +46,7 @@ namespace Server.Items } public override TextDefinition InvalidTransferMessage{ get { return 1073480; } } // Your arcane focus disappears. - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void Serialize( GenericWriter writer ) { @@ -64,4 +64,4 @@ namespace Server.Items m_StrengthBonus = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/Items/TransientItem.cs b/Scripts/Spells/Spellweaving/Items/TransientItem.cs index f290e7867..784385c48 100644 --- a/Scripts/Spells/Spellweaving/Items/TransientItem.cs +++ b/Scripts/Spells/Spellweaving/Items/TransientItem.cs @@ -27,7 +27,7 @@ namespace Server.Items private Timer m_Timer; - public override bool Nontransferable { get { return true; } } + public override bool Nontransferable => true; public override void HandleInvalidTransfer( Mobile from ) { if( InvalidTransferMessage != null ) @@ -114,4 +114,4 @@ namespace Server.Items m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), new TimerCallback( CheckExpiry ) ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/Mobiles/ArcaneFey.cs b/Scripts/Spells/Spellweaving/Mobiles/ArcaneFey.cs index 2d244f867..7b658f421 100644 --- a/Scripts/Spells/Spellweaving/Mobiles/ArcaneFey.cs +++ b/Scripts/Spells/Spellweaving/Mobiles/ArcaneFey.cs @@ -11,7 +11,7 @@ namespace Server.Mobiles public override double DispelFocus { get { return 20.0; } } public override OppositionGroup OppositionGroup { get { return OppositionGroup.FeyAndUndead; } } - public override bool InitialInnocent { get { return true; } } + public override bool InitialInnocent => true; [Constructible] public ArcaneFey() : base( AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4 ) @@ -34,7 +34,7 @@ namespace Server.Mobiles SetResistance( ResistanceType.Poison, 40, 50 ); SetResistance( ResistanceType.Energy, 40, 50 ); - SetSkill( SkillName.EvalInt, 70.1, 80.0 ); + SetSkill( SkillName.EvalInt, 70.1, 80.0 ); SetSkill( SkillName.Magery, 70.1, 80.0 ); SetSkill( SkillName.Meditation, 70.1, 80.0 ); SetSkill( SkillName.MagicResist, 50.5, 100.0 ); @@ -63,4 +63,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/Mobiles/ArcaneFiend.cs b/Scripts/Spells/Spellweaving/Mobiles/ArcaneFiend.cs index 1c83a885c..01086f6c2 100644 --- a/Scripts/Spells/Spellweaving/Mobiles/ArcaneFiend.cs +++ b/Scripts/Spells/Spellweaving/Mobiles/ArcaneFiend.cs @@ -11,12 +11,12 @@ namespace Server.Mobiles public override double DispelFocus { get { return 20.0; } } public override PackInstinct PackInstinct { get { return PackInstinct.Daemon; } } - public override bool BleedImmune { get { return true; } } //TODO: Verify on OSI. Guide says this. + public override bool BleedImmune => true; //TODO: Verify on OSI. Guide says this. + public override string DefaultName => "an imp"; [Constructible] public ArcaneFiend() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "an imp"; Body = 74; BaseSoundID = 422; @@ -64,4 +64,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/Mobiles/NatureFury.cs b/Scripts/Spells/Spellweaving/Mobiles/NatureFury.cs index fab226f04..6ffb663be 100644 --- a/Scripts/Spells/Spellweaving/Mobiles/NatureFury.cs +++ b/Scripts/Spells/Spellweaving/Mobiles/NatureFury.cs @@ -7,21 +7,21 @@ namespace Server.Mobiles public class NatureFury : BaseCreature { public override bool DeleteCorpseOnDeath { get { return Core.AOS; } } - public override bool IsHouseSummonable { get { return true; } } + public override bool IsHouseSummonable => true; public override double DispelDifficulty { get { return 125.0; } } public override double DispelFocus { get { return 90.0; } } - public override bool BleedImmune { get { return true; } } + public override bool BleedImmune => true; public override Poison PoisonImmune { get { return Poison.Lethal; } } - public override bool AlwaysMurderer { get { return true; } } + public override bool AlwaysMurderer => true; + public override string DefaultName => "a nature's fury"; [Constructible] public NatureFury() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a nature's fury"; Body = 0x33; Hue = 0x4001; @@ -84,4 +84,4 @@ namespace Server.Mobiles Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Third/Fireball.cs b/Scripts/Spells/Third/Fireball.cs index 9724898e0..dbbf9bc0a 100644 --- a/Scripts/Spells/Third/Fireball.cs +++ b/Scripts/Spells/Third/Fireball.cs @@ -24,7 +24,7 @@ namespace Server.Spells.Third Caster.Target = new InternalTarget( this ); } - public override bool DelayedDamage{ get{ return true; } } + public override bool DelayedDamage => true; public void Target( Mobile m ) { @@ -90,4 +90,4 @@ namespace Server.Spells.Third } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Third/WallOfStone.cs b/Scripts/Spells/Third/WallOfStone.cs index 21bdbc869..57b207fa7 100644 --- a/Scripts/Spells/Third/WallOfStone.cs +++ b/Scripts/Spells/Third/WallOfStone.cs @@ -95,7 +95,7 @@ namespace Server.Spells.Third private DateTime m_End; private Mobile m_Caster; - public override bool BlocksFit{ get{ return true; } } + public override bool BlocksFit => true; public InternalItem( Point3D loc, Map map, Mobile caster ) : base( 0x82 ) { @@ -223,4 +223,4 @@ namespace Server.Spells.Third } } } -} \ No newline at end of file +} diff --git a/Server/Items/VirtualCheck.cs b/Server/Items/VirtualCheck.cs index 1f27a4a05..ee86b5077 100644 --- a/Server/Items/VirtualCheck.cs +++ b/Server/Items/VirtualCheck.cs @@ -19,10 +19,10 @@ namespace Server { public static bool UseEditGump = false; - public override bool IsVirtualItem { get { return true; } } + public override bool IsVirtualItem => true; - public override bool DisplayWeight { get { return false; } } - public override bool DisplayLootType { get { return false; } } + public override bool DisplayWeight => false; + public override bool DisplayLootType => false; public override double DefaultWeight { get { return 0; } } diff --git a/Server/Mobile.cs b/Server/Mobile.cs index 30c55939c..b16399788 100644 --- a/Server/Mobile.cs +++ b/Server/Mobile.cs @@ -8386,18 +8386,18 @@ namespace Server } [CommandProperty( AccessLevel.GameMaster )] - public string Name + public virtual string Name { get { - if( m_NameMod != null ) + if ( m_NameMod != null ) return m_NameMod; return m_Name; } set { - if( m_Name != value ) // I'm leaving out the && m_NameMod == null + if ( m_Name != value ) // I'm leaving out the && m_NameMod == null { string oldName = m_Name; m_Name = value; diff --git a/Server/Timer.cs b/Server/Timer.cs index f3aa7a21e..37ab72080 100644 --- a/Server/Timer.cs +++ b/Server/Timer.cs @@ -343,7 +343,7 @@ namespace Server m_Queue.Enqueue( t ); loaded = true; - + if ( t.m_Count != 0 && (++t.m_Index >= t.m_Count) ) { t.Stop(); @@ -569,7 +569,7 @@ namespace Server public TimerCallback Callback{ get{ return m_Callback; } } - public override bool DefRegCreation{ get{ return false; } } + public override bool DefRegCreation => false; public DelayCallTimer( TimeSpan delay, TimeSpan interval, int count, TimerCallback callback ) : base( delay, interval, count ) { @@ -596,7 +596,7 @@ namespace Server public TimerStateCallback Callback{ get{ return m_Callback; } } - public override bool DefRegCreation{ get{ return false; } } + public override bool DefRegCreation => false; public DelayStateCallTimer( TimeSpan delay, TimeSpan interval, int count, TimerStateCallback callback, object state ) : base( delay, interval, count ) { @@ -625,7 +625,7 @@ namespace Server public TimerStateCallback Callback { get { return m_Callback; } } - public override bool DefRegCreation { get { return false; } } + public override bool DefRegCreation => false; public DelayStateCallTimer( TimeSpan delay, TimeSpan interval, int count, TimerStateCallback callback, T state ) : base( delay, interval, count ) @@ -683,4 +683,4 @@ namespace Server { } } -} \ No newline at end of file +}