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,144 +1,148 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Server.Engines.BulkOrders;
|
||||
using Server.Items;
|
||||
|
||||
namespace Server.Mobiles
|
||||
{
|
||||
public class Blacksmith : BaseVendor
|
||||
{
|
||||
private List<SBInfo> m_SBInfos = new List<SBInfo>();
|
||||
protected override List<SBInfo> SBInfos => m_SBInfos;
|
||||
public class Blacksmith : BaseVendor
|
||||
{
|
||||
private List<SBInfo> m_SBInfos = new List<SBInfo>();
|
||||
|
||||
public override NpcGuild NpcGuild => NpcGuild.BlacksmithsGuild;
|
||||
[Constructible]
|
||||
public Blacksmith() : base("the blacksmith")
|
||||
{
|
||||
SetSkill(SkillName.ArmsLore, 36.0, 68.0);
|
||||
SetSkill(SkillName.Blacksmith, 65.0, 88.0);
|
||||
SetSkill(SkillName.Fencing, 60.0, 83.0);
|
||||
SetSkill(SkillName.Macing, 61.0, 93.0);
|
||||
SetSkill(SkillName.Swords, 60.0, 83.0);
|
||||
SetSkill(SkillName.Tactics, 60.0, 83.0);
|
||||
SetSkill(SkillName.Parry, 61.0, 93.0);
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Blacksmith() : base( "the blacksmith" )
|
||||
{
|
||||
SetSkill( SkillName.ArmsLore, 36.0, 68.0 );
|
||||
SetSkill( SkillName.Blacksmith, 65.0, 88.0 );
|
||||
SetSkill( SkillName.Fencing, 60.0, 83.0 );
|
||||
SetSkill( SkillName.Macing, 61.0, 93.0 );
|
||||
SetSkill( SkillName.Swords, 60.0, 83.0 );
|
||||
SetSkill( SkillName.Tactics, 60.0, 83.0 );
|
||||
SetSkill( SkillName.Parry, 61.0, 93.0 );
|
||||
}
|
||||
public Blacksmith(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void InitSBInfo()
|
||||
{
|
||||
/*m_SBInfos.Add( new SBSmithTools() );
|
||||
protected override List<SBInfo> SBInfos => m_SBInfos;
|
||||
|
||||
m_SBInfos.Add( new SBMetalShields() );
|
||||
m_SBInfos.Add( new SBWoodenShields() );
|
||||
public override NpcGuild NpcGuild => NpcGuild.BlacksmithsGuild;
|
||||
|
||||
m_SBInfos.Add( new SBPlateArmor() );
|
||||
public override VendorShoeType ShoeType => VendorShoeType.None;
|
||||
|
||||
m_SBInfos.Add( new SBHelmetArmor() );
|
||||
m_SBInfos.Add( new SBChainmailArmor() );
|
||||
m_SBInfos.Add( new SBRingmailArmor() );
|
||||
m_SBInfos.Add( new SBAxeWeapon() );
|
||||
m_SBInfos.Add( new SBPoleArmWeapon() );
|
||||
m_SBInfos.Add( new SBRangedWeapon() );
|
||||
public override void InitSBInfo()
|
||||
{
|
||||
/*m_SBInfos.Add( new SBSmithTools() );
|
||||
|
||||
m_SBInfos.Add( new SBKnifeWeapon() );
|
||||
m_SBInfos.Add( new SBMaceWeapon() );
|
||||
m_SBInfos.Add( new SBSpearForkWeapon() );
|
||||
m_SBInfos.Add( new SBSwordWeapon() );*/
|
||||
m_SBInfos.Add( new SBMetalShields() );
|
||||
m_SBInfos.Add( new SBWoodenShields() );
|
||||
|
||||
m_SBInfos.Add( new SBBlacksmith() );
|
||||
if ( IsTokunoVendor )
|
||||
{
|
||||
m_SBInfos.Add( new SBSEArmor() );
|
||||
m_SBInfos.Add( new SBSEWeapons() );
|
||||
}
|
||||
}
|
||||
m_SBInfos.Add( new SBPlateArmor() );
|
||||
|
||||
public override VendorShoeType ShoeType => VendorShoeType.None;
|
||||
m_SBInfos.Add( new SBHelmetArmor() );
|
||||
m_SBInfos.Add( new SBChainmailArmor() );
|
||||
m_SBInfos.Add( new SBRingmailArmor() );
|
||||
m_SBInfos.Add( new SBAxeWeapon() );
|
||||
m_SBInfos.Add( new SBPoleArmWeapon() );
|
||||
m_SBInfos.Add( new SBRangedWeapon() );
|
||||
|
||||
public override void InitOutfit()
|
||||
{
|
||||
base.InitOutfit();
|
||||
m_SBInfos.Add( new SBKnifeWeapon() );
|
||||
m_SBInfos.Add( new SBMaceWeapon() );
|
||||
m_SBInfos.Add( new SBSpearForkWeapon() );
|
||||
m_SBInfos.Add( new SBSwordWeapon() );*/
|
||||
|
||||
Item item = ( Utility.RandomBool() ? null : new Items.RingmailChest() );
|
||||
m_SBInfos.Add(new SBBlacksmith());
|
||||
if (IsTokunoVendor)
|
||||
{
|
||||
m_SBInfos.Add(new SBSEArmor());
|
||||
m_SBInfos.Add(new SBSEWeapons());
|
||||
}
|
||||
}
|
||||
|
||||
if ( item != null && !EquipItem( item ) )
|
||||
{
|
||||
item.Delete();
|
||||
item = null;
|
||||
}
|
||||
public override void InitOutfit()
|
||||
{
|
||||
base.InitOutfit();
|
||||
|
||||
if ( item == null )
|
||||
AddItem( new Items.FullApron() );
|
||||
Item item = Utility.RandomBool() ? null : new RingmailChest();
|
||||
|
||||
AddItem( new Items.Bascinet() );
|
||||
AddItem( new Items.SmithHammer() );
|
||||
}
|
||||
if (item != null && !EquipItem(item))
|
||||
{
|
||||
item.Delete();
|
||||
item = null;
|
||||
}
|
||||
|
||||
#region Bulk Orders
|
||||
public override Item CreateBulkOrder( Mobile from, bool fromContextMenu )
|
||||
{
|
||||
PlayerMobile pm = from as PlayerMobile;
|
||||
if (item == null)
|
||||
AddItem(new FullApron());
|
||||
|
||||
if ( pm != null && pm.NextSmithBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()) )
|
||||
{
|
||||
double theirSkill = pm.Skills[SkillName.Blacksmith].Base;
|
||||
AddItem(new Bascinet());
|
||||
AddItem(new SmithHammer());
|
||||
}
|
||||
|
||||
if ( theirSkill >= 70.1 )
|
||||
pm.NextSmithBulkOrder = TimeSpan.FromHours( 6.0 );
|
||||
else if ( theirSkill >= 50.1 )
|
||||
pm.NextSmithBulkOrder = TimeSpan.FromHours( 2.0 );
|
||||
else
|
||||
pm.NextSmithBulkOrder = TimeSpan.FromHours( 1.0 );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
if ( theirSkill >= 70.1 && ((theirSkill - 40.0) / 300.0) > Utility.RandomDouble() )
|
||||
return new LargeSmithBOD();
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
return SmallSmithBOD.CreateRandomFor( from );
|
||||
}
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
return null;
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
|
||||
public override bool IsValidBulkOrder( Item item )
|
||||
{
|
||||
return ( item is SmallSmithBOD || item is LargeSmithBOD );
|
||||
}
|
||||
#region Bulk Orders
|
||||
|
||||
public override bool SupportsBulkOrders( Mobile from )
|
||||
{
|
||||
return ( from is PlayerMobile && from.Skills[SkillName.Blacksmith].Base > 0 );
|
||||
}
|
||||
public override Item CreateBulkOrder(Mobile from, bool fromContextMenu)
|
||||
{
|
||||
PlayerMobile pm = from as PlayerMobile;
|
||||
|
||||
public override TimeSpan GetNextBulkOrder( Mobile from )
|
||||
{
|
||||
if ( from is PlayerMobile )
|
||||
return ((PlayerMobile)from).NextSmithBulkOrder;
|
||||
if (pm != null && pm.NextSmithBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()))
|
||||
{
|
||||
double theirSkill = pm.Skills[SkillName.Blacksmith].Base;
|
||||
|
||||
return TimeSpan.Zero;
|
||||
}
|
||||
if (theirSkill >= 70.1)
|
||||
pm.NextSmithBulkOrder = TimeSpan.FromHours(6.0);
|
||||
else if (theirSkill >= 50.1)
|
||||
pm.NextSmithBulkOrder = TimeSpan.FromHours(2.0);
|
||||
else
|
||||
pm.NextSmithBulkOrder = TimeSpan.FromHours(1.0);
|
||||
|
||||
public override void OnSuccessfulBulkOrderReceive( Mobile from )
|
||||
{
|
||||
if ( Core.SE && from is PlayerMobile )
|
||||
((PlayerMobile)from).NextSmithBulkOrder = TimeSpan.Zero;
|
||||
}
|
||||
#endregion
|
||||
if (theirSkill >= 70.1 && (theirSkill - 40.0) / 300.0 > Utility.RandomDouble())
|
||||
return new LargeSmithBOD();
|
||||
|
||||
public Blacksmith( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
return SmallSmithBOD.CreateRandomFor(from);
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
return null;
|
||||
}
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
public override bool IsValidBulkOrder(Item item)
|
||||
{
|
||||
return item is SmallSmithBOD || item is LargeSmithBOD;
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override bool SupportsBulkOrders(Mobile from)
|
||||
{
|
||||
return from is PlayerMobile && from.Skills[SkillName.Blacksmith].Base > 0;
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
public override TimeSpan GetNextBulkOrder(Mobile from)
|
||||
{
|
||||
if (from is PlayerMobile)
|
||||
return ((PlayerMobile)from).NextSmithBulkOrder;
|
||||
|
||||
return TimeSpan.Zero;
|
||||
}
|
||||
|
||||
public override void OnSuccessfulBulkOrderReceive(Mobile from)
|
||||
{
|
||||
if (Core.SE && from is PlayerMobile)
|
||||
((PlayerMobile)from).NextSmithBulkOrder = TimeSpan.Zero;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue