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

Heritage items, talismans

Browse source
This commit is contained in:
xavier 2011-07-24 01:47:01 +00:00
parent e7db1fd9f7
commit 129cac945b
109 changed files with 11659 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Scripts/Items/Weapons/BaseWeapon.cs
View file

@ -1495,6 +1495,11 @@ namespace Server.Items
//if ( factor > 3.0 )
// factor = 3.0;
BaseTalisman talisman = attacker.Talisman as BaseTalisman;
if ( talisman != null && talisman.Killer != null )
percentageBonus += talisman.Killer.DamageBonus( defender );
percentageBonus = Math.Min( percentageBonus, 300 );
//damage = (int)(damage * factor);
@ -1943,6 +1948,11 @@ namespace Server.Items
if ( atkSlayer != null && atkSlayer.Slays( defender ) || atkSlayer2 != null && atkSlayer2.Slays( defender ) )
return CheckSlayerResult.Slayer;
BaseTalisman talisman = attacker.Talisman as BaseTalisman;
if ( talisman != null && TalismanSlayer.Slays( talisman.Slayer, defender ) )
return CheckSlayerResult.Slayer;
if ( !Core.SE )
{
ISlayer defISlayer = Spellbook.FindEquippedSpellbook( defender );