branch sync #2

This commit is contained in:
mark 2009-01-31 00:02:21 +00:00
parent 96a37544fd
commit 4e6256b8cd
39 changed files with 415 additions and 137 deletions

View file

@ -59,7 +59,7 @@ namespace Server.Items
AOS.Damage( defender, attacker, (int)(15.0 * (attacker.Skills[SkillName.Bushido].Value - 50.0) / 70.0 + 10), 100, 0, 0, 0, 0 ); //10-25
defender.Paralyze( TimeSpan.FromSeconds( 3.0 ) );
defender.Freeze( TimeSpan.FromSeconds( 2.0 ) );
Server.Items.ParalyzingBlow.BeginImmunity( defender, Server.Items.ParalyzingBlow.FreezeDelayDuration );
}
}

View file

@ -413,6 +413,19 @@ namespace Server.Items
#endregion
public override void OnAfterDuped( Item newItem )
{
BaseWeapon weap = newItem as BaseWeapon;
if ( weap == null )
return;
weap.m_AosAttributes = new AosAttributes( newItem, m_AosAttributes );
weap.m_AosElementDamages = new AosElementAttributes( newItem, m_AosElementDamages );
weap.m_AosSkillBonuses = new AosSkillBonuses( newItem, m_AosSkillBonuses );
weap.m_AosWeaponAttributes = new AosWeaponAttributes( newItem, m_AosWeaponAttributes );
}
public virtual void UnscaleDurability()
{
int scale = 100 + GetDurabilityBonus();