This commit is contained in:
parent
c63a5f13fa
commit
2204d5fb86
86 changed files with 1077 additions and 257 deletions
|
|
@ -100,7 +100,7 @@ namespace Server
|
|||
}
|
||||
|
||||
#region Dragon Barding
|
||||
if( (!Core.AOS || from == null || !from.Player) && m.Player && m.Mount is SwampDragon )
|
||||
if( (from == null || !from.Player) && m.Player && m.Mount is SwampDragon )
|
||||
{
|
||||
SwampDragon pet = m.Mount as SwampDragon;
|
||||
|
||||
|
|
|
|||
|
|
@ -281,6 +281,16 @@ namespace Server.Misc
|
|||
if ( master != null && master.AccessLevel > AccessLevel.Player )
|
||||
return Notoriety.CanBeAttacked;
|
||||
|
||||
master = bc.ControlMaster;
|
||||
|
||||
if ( Core.ML && master != null )
|
||||
{
|
||||
if( source == master && CheckAggressor( target.Aggressors, source ) )
|
||||
return Notoriety.CanBeAttacked;
|
||||
else
|
||||
return MobileNotoriety( source, master );
|
||||
}
|
||||
|
||||
if( !bc.Summoned && !bc.Controlled && ((PlayerMobile)source).EnemyOfOneType == target.GetType() )
|
||||
return Notoriety.Enemy;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ namespace Server.Misc
|
|||
|
||||
CheckBonusSkill( from, from.Mana, from.ManaMax, SkillName.Focus );
|
||||
|
||||
double focusPoints = (int)(from.Skills[SkillName.Focus].Value * 0.05);
|
||||
double focusPoints = (from.Skills[SkillName.Focus].Value * 0.05);
|
||||
|
||||
if ( armorPenalty > 0 )
|
||||
medPoints = 0; // In AOS, wearing any meditation-blocking armor completely removes meditation bonus
|
||||
|
|
@ -154,7 +154,10 @@ namespace Server.Misc
|
|||
if ( totalPoints < -1 )
|
||||
totalPoints = -1;
|
||||
|
||||
rate = 1.0 / (0.1 * (2 + (int)totalPoints));
|
||||
if ( Core.ML )
|
||||
totalPoints = Math.Floor( totalPoints );
|
||||
|
||||
rate = 1.0 / (0.1 * (2 + totalPoints));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue