Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,258 +1,248 @@
|
|||
using System;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Items
|
||||
{
|
||||
public interface ICommodity /* added IsDeedable prop so expansion-based deedables can determine true/false */
|
||||
{
|
||||
int DescriptionNumber{ get; }
|
||||
bool IsDeedable { get; }
|
||||
}
|
||||
public interface ICommodity /* added IsDeedable prop so expansion-based deedables can determine true/false */
|
||||
{
|
||||
int DescriptionNumber{ get; }
|
||||
bool IsDeedable{ get; }
|
||||
}
|
||||
|
||||
public class CommodityDeed : Item
|
||||
{
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Item Commodity { get; private set; }
|
||||
public class CommodityDeed : Item
|
||||
{
|
||||
public CommodityDeed(Item commodity) : base(0x14F0)
|
||||
{
|
||||
Weight = 1.0;
|
||||
Hue = 0x47;
|
||||
|
||||
public bool SetCommodity( Item item )
|
||||
{
|
||||
InvalidateProperties();
|
||||
Commodity = commodity;
|
||||
|
||||
if ( Commodity == null && (item as ICommodity)?.IsDeedable == true )
|
||||
{
|
||||
Commodity = item;
|
||||
Commodity.Internalize();
|
||||
InvalidateProperties();
|
||||
LootType = LootType.Blessed;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
[Constructible]
|
||||
public CommodityDeed() : this(null)
|
||||
{
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
public CommodityDeed(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public Item Commodity{ get; private set; }
|
||||
|
||||
writer.Write( (int) 1 ); // version
|
||||
public override int LabelNumber => Commodity == null ? 1047016 : 1047017;
|
||||
|
||||
writer.Write( Commodity );
|
||||
}
|
||||
public bool SetCommodity(Item item)
|
||||
{
|
||||
InvalidateProperties();
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
if (Commodity == null && (item as ICommodity)?.IsDeedable == true)
|
||||
{
|
||||
Commodity = item;
|
||||
Commodity.Internalize();
|
||||
InvalidateProperties();
|
||||
|
||||
int version = reader.ReadInt();
|
||||
return true;
|
||||
}
|
||||
|
||||
Commodity = reader.ReadItem();
|
||||
return false;
|
||||
}
|
||||
|
||||
switch ( version )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
if (Commodity != null)
|
||||
{
|
||||
Hue = 0x592;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
public CommodityDeed( Item commodity ) : base( 0x14F0 )
|
||||
{
|
||||
Weight = 1.0;
|
||||
Hue = 0x47;
|
||||
writer.Write(1); // version
|
||||
|
||||
Commodity = commodity;
|
||||
writer.Write(Commodity);
|
||||
}
|
||||
|
||||
LootType = LootType.Blessed;
|
||||
}
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
[Constructible]
|
||||
public CommodityDeed() : this( null )
|
||||
{
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
|
||||
public CommodityDeed( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
Commodity = reader.ReadItem();
|
||||
|
||||
public override void OnDelete()
|
||||
{
|
||||
Commodity?.Delete();
|
||||
switch (version)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
if (Commodity != null) Hue = 0x592;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
base.OnDelete();
|
||||
}
|
||||
public override void OnDelete()
|
||||
{
|
||||
Commodity?.Delete();
|
||||
|
||||
public override int LabelNumber => Commodity == null ? 1047016 : 1047017;
|
||||
base.OnDelete();
|
||||
}
|
||||
|
||||
public override void GetProperties( ObjectPropertyList list )
|
||||
{
|
||||
base.GetProperties( list );
|
||||
public override void GetProperties(ObjectPropertyList list)
|
||||
{
|
||||
base.GetProperties(list);
|
||||
|
||||
if ( Commodity != null )
|
||||
{
|
||||
string args;
|
||||
if (Commodity != null)
|
||||
{
|
||||
string args;
|
||||
|
||||
if ( Commodity.Name == null )
|
||||
args =
|
||||
$"#{((Commodity is ICommodity commodity) ? commodity.DescriptionNumber : Commodity.LabelNumber)}\t{Commodity.Amount}";
|
||||
else
|
||||
args = $"{Commodity.Name}\t{Commodity.Amount}";
|
||||
if (Commodity.Name == null)
|
||||
args =
|
||||
$"#{(Commodity is ICommodity commodity ? commodity.DescriptionNumber : Commodity.LabelNumber)}\t{Commodity.Amount}";
|
||||
else
|
||||
args = $"{Commodity.Name}\t{Commodity.Amount}";
|
||||
|
||||
list.Add( 1060658, args ); // ~1_val~: ~2_val~
|
||||
}
|
||||
else
|
||||
{
|
||||
list.Add( 1060748 ); // unfilled
|
||||
}
|
||||
}
|
||||
list.Add(1060658, args); // ~1_val~: ~2_val~
|
||||
}
|
||||
else
|
||||
{
|
||||
list.Add(1060748); // unfilled
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnSingleClick( Mobile from )
|
||||
{
|
||||
base.OnSingleClick( from );
|
||||
public override void OnSingleClick(Mobile from)
|
||||
{
|
||||
base.OnSingleClick(from);
|
||||
|
||||
if ( Commodity != null )
|
||||
{
|
||||
string args;
|
||||
if (Commodity != null)
|
||||
{
|
||||
string args;
|
||||
|
||||
if ( Commodity.Name == null )
|
||||
args =
|
||||
$"#{((Commodity is ICommodity commodity) ? commodity.DescriptionNumber : Commodity.LabelNumber)}\t{Commodity.Amount}";
|
||||
else
|
||||
args = $"{Commodity.Name}\t{Commodity.Amount}";
|
||||
if (Commodity.Name == null)
|
||||
args =
|
||||
$"#{(Commodity is ICommodity commodity ? commodity.DescriptionNumber : Commodity.LabelNumber)}\t{Commodity.Amount}";
|
||||
else
|
||||
args = $"{Commodity.Name}\t{Commodity.Amount}";
|
||||
|
||||
LabelTo( from, 1060658, args ); // ~1_val~: ~2_val~
|
||||
}
|
||||
}
|
||||
LabelTo(from, 1060658, args); // ~1_val~: ~2_val~
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
int number;
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
int number;
|
||||
|
||||
BankBox box = from.FindBankNoCreate();
|
||||
CommodityDeedBox cox = CommodityDeedBox.Find( this );
|
||||
BankBox box = from.FindBankNoCreate();
|
||||
CommodityDeedBox cox = CommodityDeedBox.Find(this);
|
||||
|
||||
// Veteran Rewards mods
|
||||
if ( Commodity != null )
|
||||
{
|
||||
if ( box != null && IsChildOf( box ) )
|
||||
{
|
||||
number = 1047031; // The commodity has been redeemed.
|
||||
// Veteran Rewards mods
|
||||
if (Commodity != null)
|
||||
{
|
||||
if (box != null && IsChildOf(box))
|
||||
{
|
||||
number = 1047031; // The commodity has been redeemed.
|
||||
|
||||
box.DropItem( Commodity );
|
||||
box.DropItem(Commodity);
|
||||
|
||||
Commodity = null;
|
||||
Delete();
|
||||
}
|
||||
else if ( cox != null )
|
||||
{
|
||||
if ( cox.IsSecure )
|
||||
{
|
||||
number = 1047031; // The commodity has been redeemed.
|
||||
Commodity = null;
|
||||
Delete();
|
||||
}
|
||||
else if (cox != null)
|
||||
{
|
||||
if (cox.IsSecure)
|
||||
{
|
||||
number = 1047031; // The commodity has been redeemed.
|
||||
|
||||
cox.DropItem( Commodity );
|
||||
cox.DropItem(Commodity);
|
||||
|
||||
Commodity = null;
|
||||
Delete();
|
||||
}
|
||||
else
|
||||
number = 1080525; // The commodity deed box must be secured before you can use it.
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( Core.ML )
|
||||
{
|
||||
number = 1080526; // That must be in your bank box or commodity deed box to use it.
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047024; // To claim the resources ....
|
||||
}
|
||||
}
|
||||
}
|
||||
else if ( cox != null && !cox.IsSecure )
|
||||
{
|
||||
number = 1080525; // The commodity deed box must be secured before you can use it.
|
||||
}
|
||||
else if ( ( box == null || !IsChildOf( box ) ) && cox == null )
|
||||
{
|
||||
if ( Core.ML )
|
||||
{
|
||||
number = 1080526; // That must be in your bank box or commodity deed box to use it.
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047026; // That must be in your bank box to use it.
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047029; // Target the commodity to fill this deed with.
|
||||
Commodity = null;
|
||||
Delete();
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1080525; // The commodity deed box must be secured before you can use it.
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Core.ML)
|
||||
number = 1080526; // That must be in your bank box or commodity deed box to use it.
|
||||
else
|
||||
number = 1047024; // To claim the resources ....
|
||||
}
|
||||
}
|
||||
else if (cox != null && !cox.IsSecure)
|
||||
{
|
||||
number = 1080525; // The commodity deed box must be secured before you can use it.
|
||||
}
|
||||
else if ((box == null || !IsChildOf(box)) && cox == null)
|
||||
{
|
||||
if (Core.ML)
|
||||
number = 1080526; // That must be in your bank box or commodity deed box to use it.
|
||||
else
|
||||
number = 1047026; // That must be in your bank box to use it.
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047029; // Target the commodity to fill this deed with.
|
||||
|
||||
from.Target = new InternalTarget( this );
|
||||
}
|
||||
from.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
from.SendLocalizedMessage( number );
|
||||
}
|
||||
from.SendLocalizedMessage(number);
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private CommodityDeed m_Deed;
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private CommodityDeed m_Deed;
|
||||
|
||||
public InternalTarget( CommodityDeed deed ) : base( 3, false, TargetFlags.None )
|
||||
{
|
||||
m_Deed = deed;
|
||||
}
|
||||
public InternalTarget(CommodityDeed deed) : base(3, false, TargetFlags.None)
|
||||
{
|
||||
m_Deed = deed;
|
||||
}
|
||||
|
||||
protected override void OnTarget( Mobile from, object targeted )
|
||||
{
|
||||
if ( m_Deed.Deleted )
|
||||
return;
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
{
|
||||
if (m_Deed.Deleted)
|
||||
return;
|
||||
|
||||
int number;
|
||||
int number;
|
||||
|
||||
if ( m_Deed.Commodity != null )
|
||||
{
|
||||
number = 1047028; // The commodity deed has already been filled.
|
||||
}
|
||||
else if ( targeted is Item item )
|
||||
{
|
||||
BankBox box = from.FindBankNoCreate();
|
||||
CommodityDeedBox cox = CommodityDeedBox.Find( m_Deed );
|
||||
if (m_Deed.Commodity != null)
|
||||
{
|
||||
number = 1047028; // The commodity deed has already been filled.
|
||||
}
|
||||
else if (targeted is Item item)
|
||||
{
|
||||
BankBox box = from.FindBankNoCreate();
|
||||
CommodityDeedBox cox = CommodityDeedBox.Find(m_Deed);
|
||||
|
||||
// Veteran Rewards mods
|
||||
if ( box != null && m_Deed.IsChildOf( box ) && item.IsChildOf( box ) ||
|
||||
cox != null && cox.IsSecure && item.IsChildOf( cox ) )
|
||||
{
|
||||
if ( m_Deed.SetCommodity( item ) )
|
||||
{
|
||||
m_Deed.Hue = 0x592;
|
||||
number = 1047030; // The commodity deed has been filled.
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047027; // That is not a commodity the bankers will fill a commodity deed with.
|
||||
}
|
||||
}
|
||||
else if ( Core.ML )
|
||||
{
|
||||
number = 1080526; // That must be in your bank box or commodity deed box to use it.
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047026; // That must be in your bank box to use it.
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047027; // That is not a commodity the bankers will fill a commodity deed with.
|
||||
}
|
||||
// Veteran Rewards mods
|
||||
if (box != null && m_Deed.IsChildOf(box) && item.IsChildOf(box) ||
|
||||
cox != null && cox.IsSecure && item.IsChildOf(cox))
|
||||
{
|
||||
if (m_Deed.SetCommodity(item))
|
||||
{
|
||||
m_Deed.Hue = 0x592;
|
||||
number = 1047030; // The commodity deed has been filled.
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047027; // That is not a commodity the bankers will fill a commodity deed with.
|
||||
}
|
||||
}
|
||||
else if (Core.ML)
|
||||
{
|
||||
number = 1080526; // That must be in your bank box or commodity deed box to use it.
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047026; // That must be in your bank box to use it.
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
number = 1047027; // That is not a commodity the bankers will fill a commodity deed with.
|
||||
}
|
||||
|
||||
from.SendLocalizedMessage( number );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
from.SendLocalizedMessage(number);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue