just misc merge cleanups

This commit is contained in:
mark@runuo.com 2013-09-04 23:07:39 +00:00
parent 030ad1db5b
commit 2a9b547f7b
13 changed files with 73 additions and 34 deletions

View file

@ -57,7 +57,11 @@ namespace Server.Spells.Ninjitsu
if ( attacker.Hidden )
return 1.0;
return 1.0 + GetBonus( attacker ) / 10;
/*
* Pub40 changed pvp damage max to 55%
*/
return 1.0 + GetBonus(attacker) / ( (Core.ML && attacker.Player && defender.Player) ? 40 : 10 );
}
public override void OnHit( Mobile attacker, Mobile defender, int damage )