warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs
View file

@ -34,24 +34,13 @@ namespace Server.Engines.Quests.Doom
EquipItem( new ChylothStaff() );
}
private Mobile m_AngryAt;
private BellOfTheDead m_Bell;
public BellOfTheDead Bell { get; set; }
public BellOfTheDead Bell
{
get => m_Bell;
set => m_Bell = value;
}
public Mobile AngryAt
{
get => m_AngryAt;
set => m_AngryAt = value;
}
public Mobile AngryAt { get; set; }
public virtual void BeginGiveWarning()
{
if ( Deleted || m_AngryAt == null )
if ( Deleted || AngryAt == null )
return;
Timer.DelayCall( TimeSpan.FromSeconds( 4.0 ), EndGiveWarning );
@ -59,10 +48,10 @@ namespace Server.Engines.Quests.Doom
public virtual void EndGiveWarning()
{
if ( Deleted || m_AngryAt == null )
if ( Deleted || AngryAt == null )
return;
PublicOverheadMessage( MessageType.Regular, 0x3B2, 1050013, m_AngryAt.Name ); // You have summoned me in vain ~1_NAME~! Only the dead may cross!
PublicOverheadMessage( MessageType.Regular, 0x3B2, 1050013, AngryAt.Name ); // You have summoned me in vain ~1_NAME~! Only the dead may cross!
PublicOverheadMessage( MessageType.Regular, 0x3B2, 1050014 ); // Why have you disturbed me, mortal?!?
BeginSummonDragon();
@ -70,7 +59,7 @@ namespace Server.Engines.Quests.Doom
public virtual void BeginSummonDragon()
{
if ( Deleted || m_AngryAt == null )
if ( Deleted || AngryAt == null )
return;
Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), EndSummonDragon );
@ -108,15 +97,15 @@ namespace Server.Engines.Quests.Doom
public virtual void EndSummonDragon()
{
if ( Deleted || m_AngryAt == null )
if ( Deleted || AngryAt == null )
return;
Map map = m_AngryAt.Map;
Map map = AngryAt.Map;
if ( map == null )
return;
if ( !m_AngryAt.Region.IsPartOf( "Doom" ) )
if ( !AngryAt.Region.IsPartOf( "Doom" ) )
return;
PublicOverheadMessage( MessageType.Regular, 0x3B2, 1050015 ); // Feel the wrath of my legions!!!
@ -130,12 +119,12 @@ namespace Server.Engines.Quests.Doom
for ( int i = 0; i < m_Offsets.Length; i += 2 )
{
int x = m_AngryAt.X + m_Offsets[(offset + i) % m_Offsets.Length];
int y = m_AngryAt.Y + m_Offsets[(offset + i + 1) % m_Offsets.Length];
int x = AngryAt.X + m_Offsets[(offset + i) % m_Offsets.Length];
int y = AngryAt.Y + m_Offsets[(offset + i + 1) % m_Offsets.Length];
if ( map.CanSpawnMobile( x, y, m_AngryAt.Z ) )
if ( map.CanSpawnMobile( x, y, AngryAt.Z ) )
{
dragon.MoveToWorld( new Point3D( x, y, m_AngryAt.Z ), map );
dragon.MoveToWorld( new Point3D( x, y, AngryAt.Z ), map );
foundLoc = true;
break;
}
@ -151,12 +140,12 @@ namespace Server.Engines.Quests.Doom
}
if ( !foundLoc )
dragon.MoveToWorld( m_AngryAt.Location, map );
dragon.MoveToWorld( AngryAt.Location, map );
dragon.Combatant = m_AngryAt;
dragon.Combatant = AngryAt;
if ( m_Bell != null )
m_Bell.Dragon = dragon;
if ( Bell != null )
Bell.Dragon = dragon;
}
public static void TeleportToFerry( Mobile from )
@ -192,8 +181,8 @@ namespace Server.Engines.Quests.Doom
if ( member != from && member.Map == Map.Malas && member.Region.IsPartOf( "Doom" ) )
{
if ( m_AngryAt == member )
m_AngryAt = null;
if ( AngryAt == member )
AngryAt = null;
member.CloseGump( typeof( ChylothPartyGump ) );
member.SendGump( new ChylothPartyGump( from, member ) );
@ -201,8 +190,8 @@ namespace Server.Engines.Quests.Doom
}
}
if ( m_AngryAt == from )
m_AngryAt = null;
if ( AngryAt == from )
AngryAt = null;
TeleportToFerry( from );