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

14
Scripts/Mobiles/Special/Harrower.cs
View file

@ -46,13 +46,11 @@ namespace Server.Mobiles
new SpawnEntry( new Point3D( 5579, 1858, 0 ), new Point3D( 2499, 919, 0 ) ) // Covetous
};
private static ArrayList m_Instances = new ArrayList();
public static ArrayList Instances => m_Instances;
public static ArrayList Instances { get; } = new ArrayList();
public static Harrower Spawn( Point3D platLoc, Map platMap )
{
if ( m_Instances.Count > 0 )
if ( Instances.Count > 0 )
return null;
SpawnEntry entry = m_Entries[Utility.Random( m_Entries.Length )];
@ -66,14 +64,14 @@ namespace Server.Mobiles
return harrower;
}
public static bool CanSpawn => ( m_Instances.Count == 0 );
public static bool CanSpawn => ( Instances.Count == 0 );
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 );
Instances.Add( this );
BodyValue = 146;
SetStr( 900, 1000 );
@ -200,12 +198,12 @@ namespace Server.Mobiles
public Harrower( Serial serial ) : base( serial )
{
m_Instances.Add( this );
Instances.Add( this );
}
public override void OnAfterDelete()
{
m_Instances.Remove( this );
Instances.Remove( this );
base.OnAfterDelete();
}

13
Scripts/Mobiles/Special/HarrowerTentacles.cs
View file

@ -6,16 +6,11 @@ namespace Server.Mobiles
public class HarrowerTentacles : BaseCreature
{
public override string CorpseName => "a tentacles corpse";
private Mobile m_Harrower;
private DrainTimer m_Timer;
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Harrower
{
get => m_Harrower;
set => m_Harrower = value;
}
public Mobile Harrower { get; set; }
public override string DefaultName => "tentacles of the harrower";
@ -26,7 +21,7 @@ namespace Server.Mobiles
public HarrowerTentacles( Mobile harrower ) : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 )
{
m_Harrower = harrower;
Harrower = harrower;
Body = 129;
SetStr( 901, 1000 );
@ -119,7 +114,7 @@ namespace Server.Mobiles
writer.Write( (int) 0 ); // version
writer.Write( m_Harrower );
writer.Write( Harrower );
}
public override void Deserialize( GenericReader reader )
@ -132,7 +127,7 @@ namespace Server.Mobiles
{
case 0:
{
m_Harrower = reader.ReadMobile();
Harrower = reader.ReadMobile();
m_Timer = new DrainTimer( this );
m_Timer.Start();

11
Scripts/Mobiles/Special/Neira.cs
View file

@ -143,10 +143,9 @@ namespace Server.Mobiles
private class VirtualMountItem : Item, IMountItem
{
private Mobile m_Rider;
private VirtualMount m_Mount;
public Mobile Rider => m_Rider;
public Mobile Rider { get; private set; }
public VirtualMountItem( Mobile mob )
: base( 0x3EBB )
@ -155,7 +154,7 @@ namespace Server.Mobiles
Movable = false;
m_Rider = mob;
Rider = mob;
m_Mount = new VirtualMount( this );
}
@ -173,7 +172,7 @@ namespace Server.Mobiles
writer.Write( (int)0 ); // version
writer.Write( (Mobile)m_Rider );
writer.Write( (Mobile)Rider );
}
public override void Deserialize( GenericReader reader )
@ -182,9 +181,9 @@ namespace Server.Mobiles
int version = reader.ReadInt();
m_Rider = reader.ReadMobile();
Rider = reader.ReadMobile();
if ( m_Rider == null )
if ( Rider == null )
Delete();
}
}