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

37
Scripts/Engines/Quests/Uzeraan Turmoil/Items/Cannon.cs
View file

@ -12,21 +12,16 @@ namespace Server.Engines.Quests.Haven
public class Cannon : BaseAddon
{
private CannonDirection m_CannonDirection;
private MilitiaCanoneer m_Canoneer;
[CommandProperty( AccessLevel.GameMaster )]
public CannonDirection CannonDirection { get; private set; }
[CommandProperty( AccessLevel.GameMaster )]
public CannonDirection CannonDirection => m_CannonDirection;
[CommandProperty( AccessLevel.GameMaster )]
public MilitiaCanoneer Canoneer { get => m_Canoneer;
set => m_Canoneer = value;
}
public MilitiaCanoneer Canoneer { get; set; }
[Constructible]
public Cannon( CannonDirection direction )
{
m_CannonDirection = direction;
CannonDirection = direction;
switch ( direction )
{
@ -72,7 +67,7 @@ namespace Server.Engines.Quests.Haven
public void DoFireEffect( IPoint3D target )
{
Point3D from;
switch ( m_CannonDirection )
switch ( CannonDirection )
{
case CannonDirection.North: from = new Point3D( X, Y - 1, Z ); break;
case CannonDirection.East: from = new Point3D( X + 1, Y, Z ); break;
@ -94,15 +89,15 @@ namespace Server.Engines.Quests.Haven
target.Damage( 9999, from );
}
public override bool HandlesOnMovement => m_Canoneer != null && !m_Canoneer.Deleted && m_Canoneer.Active;
public override bool HandlesOnMovement => Canoneer != null && !Canoneer.Deleted && Canoneer.Active;
public override void OnMovement( Mobile m, Point3D oldLocation )
{
if ( m_Canoneer == null || m_Canoneer.Deleted || !m_Canoneer.Active )
if ( Canoneer == null || Canoneer.Deleted || !Canoneer.Active )
return;
bool canFire;
switch ( m_CannonDirection )
switch ( CannonDirection )
{
case CannonDirection.North:
canFire = m.X >= X - 7 && m.X <= X + 7 && m.Y == Y - 7 && oldLocation.Y < Y - 7;
@ -118,21 +113,21 @@ namespace Server.Engines.Quests.Haven
break;
}
if ( canFire && m_Canoneer.WillFire( this, m ) )
Fire( m_Canoneer, m );
if ( canFire && Canoneer.WillFire( this, m ) )
Fire( Canoneer, m );
}
public override void Serialize( GenericWriter writer )
{
if ( m_Canoneer != null && m_Canoneer.Deleted )
m_Canoneer = null;
if ( Canoneer != null && Canoneer.Deleted )
Canoneer = null;
base.Serialize( writer );
writer.Write( (int) 0 ); // version
writer.WriteEncodedInt( (int) m_CannonDirection );
writer.Write( (Mobile) m_Canoneer );
writer.WriteEncodedInt( (int) CannonDirection );
writer.Write( (Mobile) Canoneer );
}
public override void Deserialize( GenericReader reader )
@ -141,8 +136,8 @@ namespace Server.Engines.Quests.Haven
int version = reader.ReadInt();
m_CannonDirection = (CannonDirection) reader.ReadEncodedInt();
m_Canoneer = (MilitiaCanoneer) reader.ReadMobile();
CannonDirection = (CannonDirection) reader.ReadEncodedInt();
Canoneer = (MilitiaCanoneer) reader.ReadMobile();
}
}

8
Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs
View file

@ -149,15 +149,13 @@ namespace Server.Engines.Quests.Haven
public class SBDryad : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBDryad()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

16
Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaCanoneer.cs
View file

@ -5,19 +5,13 @@ namespace Server.Engines.Quests.Haven
{
public class MilitiaCanoneer : BaseQuester
{
private bool m_Active;
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
{
get => m_Active;
set => m_Active = value;
}
public bool Active { get; set; }
[Constructible]
public MilitiaCanoneer() : base( "the Militia Canoneer" )
{
m_Active = true;
Active = true;
}
public override void InitBody()
@ -73,7 +67,7 @@ namespace Server.Engines.Quests.Haven
public bool WillFire( Cannon cannon, Mobile target )
{
if ( m_Active && IsEnemy( target ) )
if ( Active && IsEnemy( target ) )
{
Direction = GetDirectionTo( target );
Say( Utility.RandomList( 500651, 1049098, 1049320, 1043149 ) );
@ -93,7 +87,7 @@ namespace Server.Engines.Quests.Haven
writer.Write( (int) 0 ); // version
writer.Write( (bool) m_Active );
writer.Write( (bool) Active );
}
public override void Deserialize( GenericReader reader )
@ -102,7 +96,7 @@ namespace Server.Engines.Quests.Haven
int version = reader.ReadInt();
m_Active = reader.ReadBool();
Active = reader.ReadBool();
}
}
}

36
Scripts/Engines/Quests/Uzeraan Turmoil/Objectives.cs
View file

@ -74,15 +74,13 @@ namespace Server.Engines.Quests.Haven
public class KillHordeMinionsObjective : QuestObjective
{
private KillHordeMinionsStep m_Step;
public KillHordeMinionsStep Step => m_Step;
public KillHordeMinionsStep Step { get; private set; }
public override object Message
{
get
{
switch ( m_Step )
switch ( Step )
{
case KillHordeMinionsStep.First:
/* Find the mountain pass beyond the house which lies at the
@ -112,7 +110,7 @@ namespace Server.Engines.Quests.Haven
{
if ( System.From.Profession == 5 ) // paladin
{
switch ( m_Step )
switch ( Step )
{
case KillHordeMinionsStep.First: return 1;
case KillHordeMinionsStep.LearnKarma: return 2;
@ -128,7 +126,7 @@ namespace Server.Engines.Quests.Haven
{
get
{
if ( m_Step == KillHordeMinionsStep.LearnKarma && HasBeenRead )
if ( Step == KillHordeMinionsStep.LearnKarma && HasBeenRead )
return true;
return base.Completed;
}
@ -140,7 +138,7 @@ namespace Server.Engines.Quests.Haven
public KillHordeMinionsObjective( KillHordeMinionsStep step )
{
m_Step = step;
Step = step;
}
public override void RenderProgress( BaseQuestGump gump )
@ -185,7 +183,7 @@ namespace Server.Engines.Quests.Haven
{
if ( System.From.Profession == 5 )
{
switch ( m_Step )
switch ( Step )
{
case KillHordeMinionsStep.First:
{
@ -218,14 +216,14 @@ namespace Server.Engines.Quests.Haven
{
int version = reader.ReadEncodedInt();
m_Step = (KillHordeMinionsStep) reader.ReadEncodedInt();
Step = (KillHordeMinionsStep) reader.ReadEncodedInt();
}
public override void ChildSerialize( GenericWriter writer )
{
writer.WriteEncodedInt( (int) 0 ); // version
writer.WriteEncodedInt( (int) m_Step );
writer.WriteEncodedInt( (int) Step );
}
}
@ -391,13 +389,7 @@ namespace Server.Engines.Quests.Haven
public class GetDaemonBoneObjective : QuestObjective
{
private Container m_CorpseWithBone;
public Container CorpseWithBone
{
get => m_CorpseWithBone;
set => m_CorpseWithBone = value;
}
public Container CorpseWithBone { get; set; }
public override object Message
{
@ -451,7 +443,7 @@ namespace Server.Engines.Quests.Haven
if ( ( creature is Zombie || creature is Skeleton ) && corpse.Map == Map.Trammel && corpse.X >= 3391 && corpse.X <= 3424 && corpse.Y >= 2639 && corpse.Y <= 2664 ) // Haven graveyard
{
if ( Utility.RandomDouble() < 0.25 )
m_CorpseWithBone = corpse;
CorpseWithBone = corpse;
}
}
@ -459,17 +451,17 @@ namespace Server.Engines.Quests.Haven
{
int version = reader.ReadEncodedInt();
m_CorpseWithBone = (Container) reader.ReadItem();
CorpseWithBone = (Container) reader.ReadItem();
}
public override void ChildSerialize( GenericWriter writer )
{
if ( m_CorpseWithBone != null && m_CorpseWithBone.Deleted )
m_CorpseWithBone = null;
if ( CorpseWithBone != null && CorpseWithBone.Deleted )
CorpseWithBone = null;
writer.WriteEncodedInt( (int) 0 ); // version
writer.Write( (Item) m_CorpseWithBone );
writer.Write( (Item) CorpseWithBone );
}
}