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

Commodity deed updates: added bottles, potions, spell scrolls, zoogifungus. fixed filled hue, removed unnecessary desc prop from ICommodity, pre-aos OSI style labels dont need it.

Browse source
This commit is contained in:
xavier 2010-11-19 18:59:44 +00:00
parent c9101845f5
commit 15c6828541
36 changed files with 79 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Scripts/Items/Skill Items/Carpenter Items/Board.cs
View file

@ -14,14 +14,6 @@ namespace Server.Items
set { m_Resource = value; InvalidateProperties(); }
}
string ICommodity.Description
{
get
{
return String.Format( Amount == 1 ? "{0} {1} board" : "{0} {1} boards", Amount, CraftResources.IsStandard( m_Resource ) ? String.Empty : CraftResources.GetName( m_Resource ).ToLower() );
}
}
int ICommodity.DescriptionNumber
{
get
@ -40,6 +32,8 @@ namespace Server.Items
}
}
bool ICommodity.IsDeedable { get { return true; } }
[Constructable]
public Board()
: this( 1 )

10
Scripts/Items/Skill Items/Lumberjack/Log.cs
View file

@ -15,16 +15,8 @@ namespace Server.Items
set { m_Resource = value; InvalidateProperties(); }
}
string ICommodity.Description
{
get
{
return String.Format( Amount == 1 ? "{0} {1} log" : "{0} {1} logs", Amount, CraftResources.IsStandard( m_Resource ) ? String.Empty : CraftResources.GetName( m_Resource ).ToLower() );
}
}
int ICommodity.DescriptionNumber { get { return CraftResources.IsStandard( m_Resource ) ? LabelNumber : 1075062 + ( (int)m_Resource - (int)CraftResource.RegularWood ); } }
bool ICommodity.IsDeedable { get { return true; } }
[Constructable]
public Log() : this( 1 )
{

13
Scripts/Items/Skill Items/Magical/Misc/BlankScroll.cs
View file

@ -17,22 +17,13 @@ namespace Server.Items
Amount = amount;
}
string ICommodity.Description
{
get
{
return String.Format( "blank scroll: {0}", Amount );
}
}
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return (Core.ML); } }
public BlankScroll( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );

5
Scripts/Items/Skill Items/Magical/Misc/Bottle.cs
View file

@ -2,8 +2,11 @@ using System;
namespace Server.Items
{
public class Bottle : Item
public class Bottle : Item, ICommodity
{
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return (Core.ML); } }
[Constructable]
public Bottle() : this( 1 )
{

5
Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -35,7 +35,7 @@ namespace Server.Items
ConfusionBlastGreater
}
public abstract class BasePotion : Item, ICraftable
public abstract class BasePotion : Item, ICraftable, ICommodity
{
private PotionEffect m_PotionEffect;
@ -52,6 +52,9 @@ namespace Server.Items
}
}
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return (Core.ML); } }
public override int LabelNumber{ get{ return 1041314 + (int)m_PotionEffect; } }
public BasePotion( int itemID, PotionEffect effect ) : base( itemID )

5
Scripts/Items/Skill Items/Magical/Scrolls/SpellScroll.cs
View file

@ -6,7 +6,7 @@ using Server.ContextMenus;
namespace Server.Items
{
public class SpellScroll : Item
public class SpellScroll : Item, ICommodity
{
private int m_SpellID;
@ -18,6 +18,9 @@ namespace Server.Items
}
}
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return (Core.ML); } }
public SpellScroll( Serial serial ) : base( serial )
{
}

9
Scripts/Items/Skill Items/Specialized/Sand.cs
View file

@ -6,15 +6,8 @@ namespace Server.Items
[FlipableAttribute( 0x11EA, 0x11EB )]
public class Sand : Item, ICommodity
{
string ICommodity.Description
{
get
{
return String.Format( Amount == 1 ? "{0} sand" : "{0} sand", Amount );
}
}
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return true; } }
public override int LabelNumber{ get{ return 1044626; } } // sand