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

105
Scripts/Items/Addons/ArcheryButteAddon.cs
View file

@ -7,33 +7,14 @@ namespace Server.Items
[FlippableAttribute( 0x100A/*East*/, 0x100B/*South*/ )]
public class ArcheryButte : AddonComponent
{
private double m_MinSkill;
private double m_MaxSkill;
private int m_Arrows, m_Bolts;
private DateTime m_LastUse;
[CommandProperty( AccessLevel.GameMaster )]
public double MinSkill { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public double MinSkill
{
get => m_MinSkill;
set => m_MinSkill = value;
}
public double MaxSkill { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public double MaxSkill
{
get => m_MaxSkill;
set => m_MaxSkill = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime LastUse
{
get => m_LastUse;
set => m_LastUse = value;
}
public DateTime LastUse { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public bool FacingEast
@ -43,18 +24,10 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public int Arrows
{
get => m_Arrows;
set => m_Arrows = value;
}
public int Arrows { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int Bolts
{
get => m_Bolts;
set => m_Bolts = value;
}
public int Bolts { get; set; }
[Constructible]
public ArcheryButte() : this( 0x100A )
@ -63,8 +36,8 @@ namespace Server.Items
public ArcheryButte( int itemID ) : base( itemID )
{
m_MinSkill = -25.0;
m_MaxSkill = +25.0;
MinSkill = -25.0;
MaxSkill = +25.0;
}
public ArcheryButte( Serial serial ) : base( serial )
@ -73,7 +46,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( (m_Arrows > 0 || m_Bolts > 0) && from.InRange( GetWorldLocation(), 1 ) )
if ( (Arrows > 0 || Bolts > 0) && from.InRange( GetWorldLocation(), 1 ) )
Gather( from );
else
Fire( from );
@ -83,14 +56,14 @@ namespace Server.Items
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500592 ); // You gather the arrows and bolts.
if ( m_Arrows > 0 )
from.AddToBackpack( new Arrow( m_Arrows ) );
if ( Arrows > 0 )
from.AddToBackpack( new Arrow( Arrows ) );
if ( m_Bolts > 0 )
from.AddToBackpack( new Bolt( m_Bolts ) );
if ( Bolts > 0 )
from.AddToBackpack( new Bolt( Bolts ) );
m_Arrows = 0;
m_Bolts = 0;
Arrows = 0;
Bolts = 0;
m_Entries = null;
}
@ -99,20 +72,14 @@ namespace Server.Items
private class ScoreEntry
{
private int m_Total;
private int m_Count;
public int Total { get; set; }
public int Total{ get => m_Total;
set => m_Total = value;
}
public int Count{ get => m_Count;
set => m_Count = value;
}
public int Count { get; set; }
public void Record( int score )
{
m_Total += score;
m_Count += 1;
Total += score;
Count += 1;
}
public ScoreEntry()
@ -143,7 +110,7 @@ namespace Server.Items
return;
}
if ( DateTime.UtcNow < (m_LastUse + UseDelay) )
if ( DateTime.UtcNow < (LastUse + UseDelay) )
return;
Point3D worldLoc = GetWorldLocation();
@ -191,7 +158,7 @@ namespace Server.Items
return;
}
m_LastUse = DateTime.UtcNow;
LastUse = DateTime.UtcNow;
from.Direction = from.GetDirectionTo( GetWorldLocation() );
bow.PlaySwingAnimation( from );
@ -199,7 +166,7 @@ namespace Server.Items
ScoreEntry se = GetEntryFor( from );
if ( !from.CheckSkill( bow.Skill, m_MinSkill, m_MaxSkill ) )
if ( !from.CheckSkill( bow.Skill, MinSkill, MaxSkill ) )
{
from.PlaySound( bow.MissSound );
@ -246,7 +213,7 @@ namespace Server.Items
splitScore = 5;
}
bool split = ( isKnown && ((m_Arrows + m_Bolts) * 0.02) > Utility.RandomDouble() );
bool split = ( isKnown && ((Arrows + Bolts) * 0.02) > Utility.RandomDouble() );
if ( split )
{
@ -258,9 +225,9 @@ namespace Server.Items
PublicOverheadMessage( MessageType.Regular, 0x3B2, 1010035 + area, from.Name );
if ( isArrow )
++m_Arrows;
++Arrows;
else if ( isBolt )
++m_Bolts;
++Bolts;
}
se.Record( split ? splitScore : score );
@ -277,10 +244,10 @@ namespace Server.Items
writer.Write( (int) 0 );
writer.Write( m_MinSkill );
writer.Write( m_MaxSkill );
writer.Write( m_Arrows );
writer.Write( m_Bolts );
writer.Write( MinSkill );
writer.Write( MaxSkill );
writer.Write( Arrows );
writer.Write( Bolts );
}
public override void Deserialize( GenericReader reader )
@ -293,15 +260,15 @@ namespace Server.Items
{
case 0:
{
m_MinSkill = reader.ReadDouble();
m_MaxSkill = reader.ReadDouble();
m_Arrows = reader.ReadInt();
m_Bolts = reader.ReadInt();
MinSkill = reader.ReadDouble();
MaxSkill = reader.ReadDouble();
Arrows = reader.ReadInt();
Bolts = reader.ReadInt();
if ( m_MinSkill == 0.0 && m_MaxSkill == 30.0 )
if ( MinSkill == 0.0 && MaxSkill == 30.0 )
{
m_MinSkill = -25.0;
m_MaxSkill = +25.0;
MinSkill = -25.0;
MaxSkill = +25.0;
}
break;