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

24
Scripts/Spells/Spellweaving/EssenceOfWind.cs
View file

@ -65,24 +65,22 @@ namespace Server.Spells.Spellweaving
private class EssenceOfWindInfo
{
private Mobile m_Defender;
private int m_FCMalus;
private int m_SSIMalus;
private ExpireTimer m_Timer;
public Mobile Defender { get; }
public Mobile Defender => m_Defender;
public int FCMalus => m_FCMalus;
public int SSIMalus => m_SSIMalus;
public ExpireTimer Timer => m_Timer;
public int FCMalus { get; }
public int SSIMalus { get; }
public ExpireTimer Timer { get; }
public EssenceOfWindInfo( Mobile defender, int fcMalus, int ssiMalus, TimeSpan duration )
{
m_Defender = defender;
m_FCMalus = fcMalus;
m_SSIMalus = ssiMalus;
Defender = defender;
FCMalus = fcMalus;
SSIMalus = ssiMalus;
m_Timer = new ExpireTimer( m_Defender, duration );
m_Timer.Start();
Timer = new ExpireTimer( Defender, duration );
Timer.Start();
}
}

6
Scripts/Spells/Spellweaving/GiftOfLife.cs
View file

@ -157,15 +157,13 @@ namespace Server.Spells.Spellweaving
{
private Mobile m_Mobile;
private GiftOfLifeSpell m_Spell;
public GiftOfLifeSpell Spell => m_Spell;
public GiftOfLifeSpell Spell { get; }
public ExpireTimer( Mobile m, TimeSpan delay, GiftOfLifeSpell spell )
: base( delay )
{
m_Mobile = m;
m_Spell = spell;
Spell = spell;
}
protected override void OnTick()

16
Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs
View file

@ -6,14 +6,8 @@ namespace Server.Items
{
public override int LabelNumber => 1032629; // Arcane Focus
private int m_StrengthBonus;
[CommandProperty( AccessLevel.GameMaster )]
public int StrengthBonus
{
get => m_StrengthBonus;
set => m_StrengthBonus = value;
}
public int StrengthBonus { get; set; }
[Constructible]
public ArcaneFocus()
@ -30,7 +24,7 @@ namespace Server.Items
public ArcaneFocus( TimeSpan lifeSpan, int strengthBonus ) : base( 0x3155, lifeSpan )
{
LootType = LootType.Blessed;
m_StrengthBonus = strengthBonus;
StrengthBonus = strengthBonus;
}
public ArcaneFocus( Serial serial ) : base( serial )
@ -41,7 +35,7 @@ namespace Server.Items
{
base.GetProperties( list );
list.Add( 1060485, m_StrengthBonus.ToString() ); // strength bonus ~1_val~
list.Add( 1060485, StrengthBonus.ToString() ); // strength bonus ~1_val~
}
public override TextDefinition InvalidTransferMessage => 1073480; // Your arcane focus disappears.
@ -52,7 +46,7 @@ namespace Server.Items
base.Serialize( writer );
writer.Write( (int)0 );
writer.Write( m_StrengthBonus );
writer.Write( StrengthBonus );
}
public override void Deserialize( GenericReader reader )
@ -60,7 +54,7 @@ namespace Server.Items
base.Deserialize( reader );
int version = reader.ReadInt();
m_StrengthBonus = reader.ReadInt();
StrengthBonus = reader.ReadInt();
}
}
}

36
Scripts/Spells/Spellweaving/Items/TransientItem.cs
View file

@ -4,23 +4,11 @@ namespace Server.Items
{
public class TransientItem : Item
{
private TimeSpan m_LifeSpan;
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan LifeSpan { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan LifeSpan
{
get => m_LifeSpan;
set => m_LifeSpan = value;
}
private DateTime m_CreationTime;
[CommandProperty( AccessLevel.GameMaster )]
public DateTime CreationTime
{
get => m_CreationTime;
set => m_CreationTime = value;
}
public DateTime CreationTime { get; set; }
private Timer m_Timer;
@ -48,7 +36,7 @@ namespace Server.Items
public virtual void SendTimeRemainingMessage( Mobile to )
{
to.SendLocalizedMessage( 1072516,
$"{Name ?? $"#{LabelNumber}"}\t{(int) m_LifeSpan.TotalSeconds}"); // ~1_name~ will expire in ~2_val~ seconds!
$"{Name ?? $"#{LabelNumber}"}\t{(int) LifeSpan.TotalSeconds}"); // ~1_name~ will expire in ~2_val~ seconds!
}
public override void OnDelete()
@ -60,7 +48,7 @@ namespace Server.Items
public virtual void CheckExpiry()
{
if ( (m_CreationTime + m_LifeSpan) < DateTime.UtcNow )
if ( (CreationTime + LifeSpan) < DateTime.UtcNow )
Expire( RootParent as Mobile );
else
InvalidateProperties();
@ -70,8 +58,8 @@ namespace Server.Items
public TransientItem( int itemID, TimeSpan lifeSpan )
: base( itemID )
{
m_CreationTime = DateTime.UtcNow;
m_LifeSpan = lifeSpan;
CreationTime = DateTime.UtcNow;
LifeSpan = lifeSpan;
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), CheckExpiry );
}
@ -85,7 +73,7 @@ namespace Server.Items
{
base.GetProperties( list );
TimeSpan remaining = ((m_CreationTime + m_LifeSpan) - DateTime.UtcNow);
TimeSpan remaining = ((CreationTime + LifeSpan) - DateTime.UtcNow);
list.Add( 1072517, ((int)remaining.TotalSeconds).ToString() ); // Lifespan: ~1_val~ seconds
}
@ -95,8 +83,8 @@ namespace Server.Items
base.Serialize( writer );
writer.Write( (int)0 );
writer.Write( m_LifeSpan );
writer.Write( m_CreationTime );
writer.Write( LifeSpan );
writer.Write( CreationTime );
}
public override void Deserialize( GenericReader reader )
@ -104,8 +92,8 @@ namespace Server.Items
base.Deserialize( reader );
int version = reader.ReadInt();
m_LifeSpan = reader.ReadTimeSpan();
m_CreationTime = reader.ReadDateTime();
LifeSpan = reader.ReadTimeSpan();
CreationTime = reader.ReadDateTime();
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), CheckExpiry );
}