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

deathstrike fix

Browse source
This commit is contained in:
xavier 2011-08-21 02:26:38 +00:00
parent 215e8930aa
commit 7ae5b6e4d3
3 changed files with 43 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Scripts/Misc/AOS.cs
View file

@ -40,20 +40,20 @@ namespace Server
public static int Damage( Mobile m, Mobile from, int damage, int phys, int fire, int cold, int pois, int nrgy )
{
return Damage( m, from, damage, false, phys, fire, cold, pois, nrgy, 0, 0, false, false );
return Damage( m, from, damage, false, phys, fire, cold, pois, nrgy, 0, 0, false, false, false );
}
public static int Damage( Mobile m, Mobile from, int damage, bool ignoreArmor, int phys, int fire, int cold, int pois, int nrgy )
{
return Damage( m, from, damage, ignoreArmor, phys, fire, cold, pois, nrgy, 0, 0, false, false );
return Damage( m, from, damage, ignoreArmor, phys, fire, cold, pois, nrgy, 0, 0, false, false, false );
}
public static int Damage( Mobile m, Mobile from, int damage, int phys, int fire, int cold, int pois, int nrgy, bool keepAlive )
{
return Damage( m, from, damage, false, phys, fire, cold, pois, nrgy, 0, 0, keepAlive, false );
return Damage( m, from, damage, false, phys, fire, cold, pois, nrgy, 0, 0, keepAlive, false, false );
}
public static int Damage( Mobile m, Mobile from, int damage, bool ignoreArmor, int phys, int fire, int cold, int pois, int nrgy, int chaos, int direct, bool keepAlive, bool archer )
public static int Damage( Mobile m, Mobile from, int damage, bool ignoreArmor, int phys, int fire, int cold, int pois, int nrgy, int chaos, int direct, bool keepAlive, bool archer, bool deathStrike )
{
if( m == null || m.Deleted || !m.Alive || damage <= 0 )
return 0;
@ -127,7 +127,10 @@ namespace Server
if ( quiver != null )
damage += damage * quiver.DamageIncrease / 100;
totalDamage = Math.Min( damage, 35 ); //Direct Damage cap of 35
if ( !deathStrike )
totalDamage = Math.Min( damage, 35 ); // Direct Damage cap of 35
else
totalDamage = Math.Min( damage, 70 ); // Direct Damage cap of 70
}
else
{