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

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,59 +2,59 @@ using System;
namespace Server.Items
{
public class ArcaneFocus : TransientItem
{
public override int LabelNumber => 1032629; // Arcane Focus
public class ArcaneFocus : TransientItem
{
[Constructible]
public ArcaneFocus()
: this(TimeSpan.FromHours(1), 1)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public int StrengthBonus { get; set; }
[Constructible]
public ArcaneFocus(int lifeSpan, int strengthBonus)
: this(TimeSpan.FromSeconds(lifeSpan), strengthBonus)
{
}
[Constructible]
public ArcaneFocus()
: this( TimeSpan.FromHours( 1 ), 1 )
{
}
public ArcaneFocus(TimeSpan lifeSpan, int strengthBonus) : base(0x3155, lifeSpan)
{
LootType = LootType.Blessed;
StrengthBonus = strengthBonus;
}
[Constructible]
public ArcaneFocus( int lifeSpan, int strengthBonus )
: this( TimeSpan.FromSeconds( lifeSpan ), strengthBonus )
{
}
public ArcaneFocus(Serial serial) : base(serial)
{
}
public ArcaneFocus( TimeSpan lifeSpan, int strengthBonus ) : base( 0x3155, lifeSpan )
{
LootType = LootType.Blessed;
StrengthBonus = strengthBonus;
}
public override int LabelNumber => 1032629; // Arcane Focus
public ArcaneFocus( Serial serial ) : base( serial )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public int StrengthBonus{ get; set; }
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public override TextDefinition InvalidTransferMessage => 1073480; // Your arcane focus disappears.
public override bool Nontransferable => true;
list.Add( 1060485, StrengthBonus.ToString() ); // strength bonus ~1_val~
}
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
public override TextDefinition InvalidTransferMessage => 1073480; // Your arcane focus disappears.
public override bool Nontransferable => true;
list.Add(1060485, StrengthBonus.ToString()); // strength bonus ~1_val~
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
writer.Write( StrengthBonus );
}
writer.Write(StrengthBonus);
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
StrengthBonus = reader.ReadInt();
}
}
}
StrengthBonus = reader.ReadInt();
}
}
}

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

@ -2,100 +2,101 @@ using System;
namespace Server.Items
{
public class TransientItem : Item
{
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan LifeSpan { get; set; }
public class TransientItem : Item
{
private Timer m_Timer;
[CommandProperty( AccessLevel.GameMaster )]
public DateTime CreationTime { get; set; }
[Constructible]
public TransientItem(int itemID, TimeSpan lifeSpan)
: base(itemID)
{
CreationTime = DateTime.UtcNow;
LifeSpan = lifeSpan;
private Timer m_Timer;
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5), CheckExpiry);
}
public override bool Nontransferable => true;
public override void HandleInvalidTransfer( Mobile from )
{
if ( InvalidTransferMessage != null )
TextDefinition.SendMessageTo( from, InvalidTransferMessage );
public TransientItem(Serial serial)
: base(serial)
{
}
Delete();
}
[CommandProperty(AccessLevel.GameMaster)]
public TimeSpan LifeSpan{ get; set; }
public virtual TextDefinition InvalidTransferMessage => null;
[CommandProperty(AccessLevel.GameMaster)]
public DateTime CreationTime{ get; set; }
public override bool Nontransferable => true;
public virtual TextDefinition InvalidTransferMessage => null;
public override void HandleInvalidTransfer(Mobile from)
{
if (InvalidTransferMessage != null)
TextDefinition.SendMessageTo(from, InvalidTransferMessage);
Delete();
}
public virtual void Expire( Mobile parent )
{
parent?.SendLocalizedMessage( 1072515, Name ?? $"#{LabelNumber}" ); // The ~1_name~ expired...
public virtual void Expire(Mobile parent)
{
parent?.SendLocalizedMessage(1072515, Name ?? $"#{LabelNumber}"); // The ~1_name~ expired...
Effects.PlaySound( GetWorldLocation(), Map, 0x201 );
Effects.PlaySound(GetWorldLocation(), Map, 0x201);
Delete();
}
Delete();
}
public virtual void SendTimeRemainingMessage( Mobile to )
{
to.SendLocalizedMessage( 1072516,
$"{Name ?? $"#{LabelNumber}"}\t{(int) LifeSpan.TotalSeconds}"); // ~1_name~ will expire in ~2_val~ seconds!
}
public virtual void SendTimeRemainingMessage(Mobile to)
{
to.SendLocalizedMessage(1072516,
$"{Name ?? $"#{LabelNumber}"}\t{(int)LifeSpan.TotalSeconds}"); // ~1_name~ will expire in ~2_val~ seconds!
}
public override void OnDelete()
{
m_Timer?.Stop();
public override void OnDelete()
{
m_Timer?.Stop();
base.OnDelete();
}
base.OnDelete();
}
public virtual void CheckExpiry()
{
if ( (CreationTime + LifeSpan) < DateTime.UtcNow )
Expire( RootParent as Mobile );
else
InvalidateProperties();
}
public virtual void CheckExpiry()
{
if (CreationTime + LifeSpan < DateTime.UtcNow)
Expire(RootParent as Mobile);
else
InvalidateProperties();
}
[Constructible]
public TransientItem( int itemID, TimeSpan lifeSpan )
: base( itemID )
{
CreationTime = DateTime.UtcNow;
LifeSpan = lifeSpan;
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), CheckExpiry );
}
TimeSpan remaining = CreationTime + LifeSpan - DateTime.UtcNow;
public TransientItem( Serial serial )
: base( serial )
{
}
list.Add(1072517, ((int)remaining.TotalSeconds).ToString()); // Lifespan: ~1_val~ seconds
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
TimeSpan remaining = ((CreationTime + LifeSpan) - DateTime.UtcNow);
writer.Write(LifeSpan);
writer.Write(CreationTime);
}
list.Add( 1072517, ((int)remaining.TotalSeconds).ToString() ); // Lifespan: ~1_val~ seconds
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 );
LifeSpan = reader.ReadTimeSpan();
CreationTime = reader.ReadDateTime();
writer.Write( LifeSpan );
writer.Write( CreationTime );
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
LifeSpan = reader.ReadTimeSpan();
CreationTime = reader.ReadDateTime();
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), CheckExpiry );
}
}
}
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5), CheckExpiry);
}
}
}