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

revert crafting updates of SVN538. Per Mark: changing baseclasses is a bad idea.

Browse source
This commit is contained in:
xavier 2010-10-10 15:37:22 +00:00
parent 7399519cf7
commit e86794c4e6
130 changed files with 1007 additions and 4906 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Scripts/Misc/AOS.cs
View file

@ -224,13 +224,7 @@ namespace Server
EnhancePotions=0x00080000,
Luck=0x00100000,
SpellChanneling=0x00200000,
NightSight=0x00400000,
LowerWeight=0x00800000
}
public interface IAosAttributes
{
AosAttributes Attributes{ get; set; }
NightSight=0x00400000
}
public sealed class AosAttributes : BaseAttributes
@ -262,9 +256,43 @@ namespace Server
{
Item obj = items[i];
if( obj is IAosAttributes )
if( obj is BaseWeapon )
{
AosAttributes attrs = ((IAosAttributes)obj).Attributes;
AosAttributes attrs = ((BaseWeapon)obj).Attributes;
if( attrs != null )
value += attrs[attribute];
if( attribute == AosAttribute.Luck )
value += ((BaseWeapon)obj).GetLuckBonus();
}
else if( obj is BaseArmor )
{
AosAttributes attrs = ((BaseArmor)obj).Attributes;
if( attrs != null )
value += attrs[attribute];
if( attribute == AosAttribute.Luck )
value += ((BaseArmor)obj).GetLuckBonus();
}
else if( obj is BaseJewel )
{
AosAttributes attrs = ((BaseJewel)obj).Attributes;
if( attrs != null )
value += attrs[attribute];
}
else if( obj is BaseClothing )
{
AosAttributes attrs = ((BaseClothing)obj).Attributes;
if( attrs != null )
value += attrs[attribute];
}
else if( obj is Spellbook )
{
AosAttributes attrs = ((Spellbook)obj).Attributes;
if( attrs != null )
value += attrs[attribute];
@ -394,9 +422,6 @@ namespace Server
[CommandProperty( AccessLevel.GameMaster )]
public int NightSight { get { return this[AosAttribute.NightSight]; } set { this[AosAttribute.NightSight] = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int LowerWeight { get { return this[AosAttribute.LowerWeight]; } set { this[AosAttribute.LowerWeight] = value; } }
}
[Flags]
@ -1114,16 +1139,6 @@ namespace Server
}
}
if( (bitmask == (int)AosAttribute.LowerWeight) && (this is AosAttributes) )
{
if( m_Owner is BaseArmor )
((BaseArmor)m_Owner).ModifyWeight();
else if( m_Owner is BaseWeapon )
((BaseWeapon)m_Owner).ModifyWeight();
else if( m_Owner is BaseOtherEquipable )
((BaseOtherEquipable)m_Owner).ModifyWeight();
}
m_Owner.InvalidateProperties();
}