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

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

View file

@ -6,161 +6,161 @@ using Server.Network;
namespace Server.Engines.MLQuests.Items
{
public abstract class QuestGiverItem : Item, IQuestGiver
{
private List<MLQuest> m_MLQuests;
public abstract class QuestGiverItem : Item, IQuestGiver
{
private List<MLQuest> m_MLQuests;
public List<MLQuest> MLQuests
{
get
{
if ( m_MLQuests == null )
{
m_MLQuests = MLQuestSystem.FindQuestList( GetType() );
public QuestGiverItem(int itemId)
: base(itemId)
{
}
if ( m_MLQuests == null )
m_MLQuests = MLQuestSystem.EmptyList;
}
public QuestGiverItem(Serial serial)
: base(serial)
{
}
return m_MLQuests;
}
}
public bool CanGiveMLQuest => MLQuests.Count != 0;
public bool CanGiveMLQuest => ( MLQuests.Count != 0 );
public override bool Nontransferable => true;
public QuestGiverItem( int itemId )
: base( itemId )
{
}
public List<MLQuest> MLQuests
{
get
{
if (m_MLQuests == null)
{
m_MLQuests = MLQuestSystem.FindQuestList(GetType());
public override bool Nontransferable => true;
if (m_MLQuests == null)
m_MLQuests = MLQuestSystem.EmptyList;
}
public override void AddNameProperties( ObjectPropertyList list )
{
base.AddNameProperties( list );
return m_MLQuests;
}
}
AddQuestItemProperty( list );
public override void AddNameProperties(ObjectPropertyList list)
{
base.AddNameProperties(list);
if ( CanGiveMLQuest )
list.Add( 1072269 ); // Quest Giver
}
AddQuestItemProperty(list);
public override void OnDoubleClick( Mobile from )
{
if ( !from.InRange( GetWorldLocation(), 2 ) )
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
else if ( !IsChildOf( from.Backpack ) )
from.SendLocalizedMessage( 1042593 ); // That is not in your backpack.
else if ( MLQuestSystem.Enabled && CanGiveMLQuest && from is PlayerMobile mobile )
MLQuestSystem.OnDoubleClick( this, mobile );
}
if (CanGiveMLQuest)
list.Add(1072269); // Quest Giver
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
public override void OnDoubleClick(Mobile from)
{
if (!from.InRange(GetWorldLocation(), 2))
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
else if (!IsChildOf(from.Backpack))
from.SendLocalizedMessage(1042593); // That is not in your backpack.
else if (MLQuestSystem.Enabled && CanGiveMLQuest && from is PlayerMobile mobile)
MLQuestSystem.OnDoubleClick(this, mobile);
}
if ( MLQuestSystem.Enabled )
MLQuestSystem.HandleDeletion( this );
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
public QuestGiverItem( Serial serial )
: base( serial )
{
}
if (MLQuestSystem.Enabled)
MLQuestSystem.HandleDeletion(this);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int)0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
public abstract class TransientQuestGiverItem : TransientItem, IQuestGiver
{
private List<MLQuest> m_MLQuests;
public abstract class TransientQuestGiverItem : TransientItem, IQuestGiver
{
private List<MLQuest> m_MLQuests;
public List<MLQuest> MLQuests
{
get
{
if ( m_MLQuests == null )
{
m_MLQuests = MLQuestSystem.FindQuestList( GetType() );
public TransientQuestGiverItem(int itemId, TimeSpan lifeSpan)
: base(itemId, lifeSpan)
{
}
if ( m_MLQuests == null )
m_MLQuests = MLQuestSystem.EmptyList;
}
public TransientQuestGiverItem(Serial serial)
: base(serial)
{
}
return m_MLQuests;
}
}
public bool CanGiveMLQuest => MLQuests.Count != 0;
public bool CanGiveMLQuest => ( MLQuests.Count != 0 );
public override bool Nontransferable => true;
public TransientQuestGiverItem( int itemId, TimeSpan lifeSpan )
: base( itemId, lifeSpan )
{
}
public List<MLQuest> MLQuests
{
get
{
if (m_MLQuests == null)
{
m_MLQuests = MLQuestSystem.FindQuestList(GetType());
public override bool Nontransferable => true;
if (m_MLQuests == null)
m_MLQuests = MLQuestSystem.EmptyList;
}
public override void HandleInvalidTransfer( Mobile from )
{
}
return m_MLQuests;
}
}
public override void AddNameProperties( ObjectPropertyList list )
{
base.AddNameProperties( list );
public override void HandleInvalidTransfer(Mobile from)
{
}
AddQuestItemProperty( list );
public override void AddNameProperties(ObjectPropertyList list)
{
base.AddNameProperties(list);
if ( CanGiveMLQuest )
list.Add( 1072269 ); // Quest Giver
}
AddQuestItemProperty(list);
public override void OnDoubleClick( Mobile from )
{
if ( !from.InRange( GetWorldLocation(), 2 ) )
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
else if ( !IsChildOf( from.Backpack ) )
from.SendLocalizedMessage( 1042593 ); // That is not in your backpack.
else if ( MLQuestSystem.Enabled && CanGiveMLQuest && from is PlayerMobile mobile )
MLQuestSystem.OnDoubleClick( this, mobile );
}
if (CanGiveMLQuest)
list.Add(1072269); // Quest Giver
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
public override void OnDoubleClick(Mobile from)
{
if (!from.InRange(GetWorldLocation(), 2))
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
else if (!IsChildOf(from.Backpack))
from.SendLocalizedMessage(1042593); // That is not in your backpack.
else if (MLQuestSystem.Enabled && CanGiveMLQuest && from is PlayerMobile mobile)
MLQuestSystem.OnDoubleClick(this, mobile);
}
if ( MLQuestSystem.Enabled )
MLQuestSystem.HandleDeletion( this );
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
public TransientQuestGiverItem( Serial serial )
: base( serial )
{
}
if (MLQuestSystem.Enabled)
MLQuestSystem.HandleDeletion(this);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int)0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}
int version = reader.ReadInt();
}
}
}