Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,177 +1,188 @@
|
|||
using Server.Gumps;
|
||||
using Server.Engines.VeteranRewards;
|
||||
using Server.Gumps;
|
||||
|
||||
namespace Server.Items
|
||||
{
|
||||
public enum MinotaurStatueType
|
||||
{
|
||||
AttackSouth = 100,
|
||||
AttackEast = 101,
|
||||
DefendSouth = 102,
|
||||
DefendEast = 103
|
||||
}
|
||||
public enum MinotaurStatueType
|
||||
{
|
||||
AttackSouth = 100,
|
||||
AttackEast = 101,
|
||||
DefendSouth = 102,
|
||||
DefendEast = 103
|
||||
}
|
||||
|
||||
public class MinotaurStatue : BaseAddon, IRewardItem
|
||||
{
|
||||
public override BaseAddonDeed Deed
|
||||
{
|
||||
get
|
||||
{
|
||||
MinotaurStatueDeed deed = new MinotaurStatueDeed();
|
||||
deed.IsRewardItem = m_IsRewardItem;
|
||||
public class MinotaurStatue : BaseAddon, IRewardItem
|
||||
{
|
||||
private bool m_IsRewardItem;
|
||||
|
||||
return deed;
|
||||
}
|
||||
}
|
||||
[Constructible]
|
||||
public MinotaurStatue(MinotaurStatueType type)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case MinotaurStatueType.AttackSouth:
|
||||
AddComponent(new AddonComponent(0x306C), 0, 0, 0);
|
||||
AddComponent(new AddonComponent(0x306D), -1, 0, 0);
|
||||
AddComponent(new AddonComponent(0x306E), 0, -1, 0);
|
||||
break;
|
||||
case MinotaurStatueType.AttackEast:
|
||||
AddComponent(new AddonComponent(0x3074), 0, 0, 0);
|
||||
AddComponent(new AddonComponent(0x3075), -1, 0, 0);
|
||||
AddComponent(new AddonComponent(0x3076), 0, -1, 0);
|
||||
break;
|
||||
case MinotaurStatueType.DefendSouth:
|
||||
AddComponent(new AddonComponent(0x3072), 0, 0, 0);
|
||||
AddComponent(new AddonComponent(0x3073), 0, -1, 0);
|
||||
break;
|
||||
case MinotaurStatueType.DefendEast:
|
||||
AddComponent(new AddonComponent(0x306F), 0, 0, 0);
|
||||
AddComponent(new AddonComponent(0x3070), -1, 0, 0);
|
||||
AddComponent(new AddonComponent(0x3071), 0, -1, 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private bool m_IsRewardItem;
|
||||
public MinotaurStatue(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsRewardItem
|
||||
{
|
||||
get => m_IsRewardItem;
|
||||
set{ m_IsRewardItem = value; InvalidateProperties(); }
|
||||
}
|
||||
public override BaseAddonDeed Deed
|
||||
{
|
||||
get
|
||||
{
|
||||
MinotaurStatueDeed deed = new MinotaurStatueDeed();
|
||||
deed.IsRewardItem = m_IsRewardItem;
|
||||
|
||||
[Constructible]
|
||||
public MinotaurStatue( MinotaurStatueType type )
|
||||
{
|
||||
switch ( type )
|
||||
{
|
||||
case MinotaurStatueType.AttackSouth:
|
||||
AddComponent( new AddonComponent( 0x306C ), 0, 0, 0 );
|
||||
AddComponent( new AddonComponent( 0x306D ), -1, 0, 0 );
|
||||
AddComponent( new AddonComponent( 0x306E ), 0, -1, 0 );
|
||||
break;
|
||||
case MinotaurStatueType.AttackEast:
|
||||
AddComponent( new AddonComponent( 0x3074 ), 0, 0, 0 );
|
||||
AddComponent( new AddonComponent( 0x3075 ), -1, 0, 0 );
|
||||
AddComponent( new AddonComponent( 0x3076 ), 0, -1, 0 );
|
||||
break;
|
||||
case MinotaurStatueType.DefendSouth:
|
||||
AddComponent( new AddonComponent( 0x3072 ), 0, 0, 0 );
|
||||
AddComponent( new AddonComponent( 0x3073 ), 0, -1, 0 );
|
||||
break;
|
||||
case MinotaurStatueType.DefendEast:
|
||||
AddComponent( new AddonComponent( 0x306F ), 0, 0, 0 );
|
||||
AddComponent( new AddonComponent( 0x3070 ), -1, 0, 0 );
|
||||
AddComponent( new AddonComponent( 0x3071 ), 0, -1, 0 );
|
||||
break;
|
||||
}
|
||||
}
|
||||
return deed;
|
||||
}
|
||||
}
|
||||
|
||||
public MinotaurStatue( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool IsRewardItem
|
||||
{
|
||||
get => m_IsRewardItem;
|
||||
set
|
||||
{
|
||||
m_IsRewardItem = value;
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.WriteEncodedInt( 0 ); // version
|
||||
writer.WriteEncodedInt(0); // version
|
||||
|
||||
writer.Write( (bool) m_IsRewardItem );
|
||||
}
|
||||
writer.Write(m_IsRewardItem);
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadEncodedInt();
|
||||
int version = reader.ReadEncodedInt();
|
||||
|
||||
m_IsRewardItem = reader.ReadBool();
|
||||
}
|
||||
}
|
||||
m_IsRewardItem = reader.ReadBool();
|
||||
}
|
||||
}
|
||||
|
||||
public class MinotaurStatueDeed : BaseAddonDeed, IRewardItem, IRewardOption
|
||||
{
|
||||
public override int LabelNumber => 1080409; // Minotaur Statue Deed
|
||||
public class MinotaurStatueDeed : BaseAddonDeed, IRewardItem, IRewardOption
|
||||
{
|
||||
private bool m_IsRewardItem;
|
||||
|
||||
public override BaseAddon Addon
|
||||
{
|
||||
get
|
||||
{
|
||||
MinotaurStatue addon = new MinotaurStatue( m_StatueType );
|
||||
addon.IsRewardItem = m_IsRewardItem;
|
||||
private MinotaurStatueType m_StatueType;
|
||||
|
||||
return addon;
|
||||
}
|
||||
}
|
||||
[Constructible]
|
||||
public MinotaurStatueDeed()
|
||||
{
|
||||
LootType = LootType.Blessed;
|
||||
}
|
||||
|
||||
private MinotaurStatueType m_StatueType;
|
||||
private bool m_IsRewardItem;
|
||||
public MinotaurStatueDeed(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsRewardItem
|
||||
{
|
||||
get => m_IsRewardItem;
|
||||
set{ m_IsRewardItem = value; InvalidateProperties(); }
|
||||
}
|
||||
public override int LabelNumber => 1080409; // Minotaur Statue Deed
|
||||
|
||||
[Constructible]
|
||||
public MinotaurStatueDeed()
|
||||
{
|
||||
LootType = LootType.Blessed;
|
||||
}
|
||||
public override BaseAddon Addon
|
||||
{
|
||||
get
|
||||
{
|
||||
MinotaurStatue addon = new MinotaurStatue(m_StatueType);
|
||||
addon.IsRewardItem = m_IsRewardItem;
|
||||
|
||||
public MinotaurStatueDeed( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
return addon;
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) )
|
||||
return;
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool IsRewardItem
|
||||
{
|
||||
get => m_IsRewardItem;
|
||||
set
|
||||
{
|
||||
m_IsRewardItem = value;
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
||||
if ( IsChildOf( from.Backpack ) )
|
||||
{
|
||||
from.CloseGump( typeof( RewardOptionGump ) );
|
||||
from.SendGump( new RewardOptionGump( this ) );
|
||||
}
|
||||
else
|
||||
from.SendLocalizedMessage( 1062334 ); // This item must be in your backpack to be used.
|
||||
}
|
||||
public void GetOptions(RewardOptionList list)
|
||||
{
|
||||
list.Add((int)MinotaurStatueType.AttackSouth, 1080410); // Minotaur Attack South
|
||||
list.Add((int)MinotaurStatueType.AttackEast, 1080411); // Minotaur Attack East
|
||||
list.Add((int)MinotaurStatueType.DefendSouth, 1080412); // Minotaur Defend South
|
||||
list.Add((int)MinotaurStatueType.DefendEast, 1080413); // Minotaur Defend East
|
||||
}
|
||||
|
||||
public override void GetProperties( ObjectPropertyList list )
|
||||
{
|
||||
base.GetProperties( list );
|
||||
public void OnOptionSelected(Mobile from, int option)
|
||||
{
|
||||
m_StatueType = (MinotaurStatueType)option;
|
||||
|
||||
if ( m_IsRewardItem )
|
||||
list.Add( 1076218 ); // 2nd Year Veteran Reward
|
||||
}
|
||||
if (!Deleted)
|
||||
base.OnDoubleClick(from);
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (m_IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this, null))
|
||||
return;
|
||||
|
||||
writer.WriteEncodedInt( 0 ); // version
|
||||
if (IsChildOf(from.Backpack))
|
||||
{
|
||||
from.CloseGump(typeof(RewardOptionGump));
|
||||
from.SendGump(new RewardOptionGump(this));
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(1062334); // This item must be in your backpack to be used.
|
||||
}
|
||||
}
|
||||
|
||||
writer.Write( (bool) m_IsRewardItem );
|
||||
}
|
||||
public override void GetProperties(ObjectPropertyList list)
|
||||
{
|
||||
base.GetProperties(list);
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
if (m_IsRewardItem)
|
||||
list.Add(1076218); // 2nd Year Veteran Reward
|
||||
}
|
||||
|
||||
int version = reader.ReadEncodedInt();
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
m_IsRewardItem = reader.ReadBool();
|
||||
}
|
||||
writer.WriteEncodedInt(0); // version
|
||||
|
||||
public void GetOptions( RewardOptionList list )
|
||||
{
|
||||
list.Add( (int) MinotaurStatueType.AttackSouth, 1080410 ); // Minotaur Attack South
|
||||
list.Add( (int) MinotaurStatueType.AttackEast, 1080411 ); // Minotaur Attack East
|
||||
list.Add( (int) MinotaurStatueType.DefendSouth, 1080412 ); // Minotaur Defend South
|
||||
list.Add( (int) MinotaurStatueType.DefendEast, 1080413 ); // Minotaur Defend East
|
||||
}
|
||||
writer.Write(m_IsRewardItem);
|
||||
}
|
||||
|
||||
public void OnOptionSelected( Mobile from, int option )
|
||||
{
|
||||
m_StatueType = (MinotaurStatueType) option;
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
if ( !Deleted )
|
||||
base.OnDoubleClick( from );
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadEncodedInt();
|
||||
|
||||
m_IsRewardItem = reader.ReadBool();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue