- Any creature already aggressive to you before using Embrace Honor, or attacked while under Embrace Honor, will attack you back

(http://www.uodemise.com/discussion/showthread.php?t=141415)

- Fixed a bug in Spellweaving Arcane Circle spell causing the arcanist to get more than one arcane focus
(http://www.uodemise.com/discussion/showthread.php?t=140429)

- Added a sanity check in SpellHelper.cs
(http://www.uodemise.com/discussion/showthread.php?t=139731)
(http://www.runuo.com/forums/showthread.php?p=829126)

- Provoked creatures won't return anymore the message *looks furious* (ML change)
(http://www.uodemise.com/discussion/showthread.php?t=138228)
This commit is contained in:
daedalus 2010-04-02 11:55:13 +00:00
parent 42d5433ded
commit 489bbabe93
4 changed files with 19 additions and 5 deletions

View file

@ -2501,7 +2501,7 @@ namespace Server.Mobiles
continue;
// Ignore players with activated honor
if ( m is PlayerMobile && ( (PlayerMobile)m ).HonorActive )
if ( m is PlayerMobile && ( (PlayerMobile)m ).HonorActive && !( m_Mobile.Combatant == m ))
continue;
if( acqType == FightMode.Aggressor || acqType == FightMode.Evil )

View file

@ -4989,8 +4989,11 @@ namespace Server.Mobiles
{
BardProvoked = true;
this.PublicOverheadMessage( MessageType.Emote, EmoteHue, false, "*looks furious*" );
if ( !Core.ML )
{
this.PublicOverheadMessage( MessageType.Emote, EmoteHue, false, "*looks furious*" );
}
if ( bSuccess )
{
PlaySound( GetIdleSound() );

View file

@ -958,7 +958,11 @@ namespace Server.Spells
WeightOverloading.DFA = dfa;
int damageGiven = AOS.Damage( target, from, iDamage, phys, fire, cold, pois, nrgy );
DoLeech( damageGiven, from, target );
if ( from != null ) // sanity check
{
DoLeech( damageGiven, from, target );
}
WeightOverloading.DFA = DFAlgorithm.Standard;
}
@ -1077,7 +1081,11 @@ namespace Server.Spells
WeightOverloading.DFA = m_DFA;
int damageGiven = AOS.Damage( m_Target, m_From, m_Damage, m_Phys, m_Fire, m_Cold, m_Pois, m_Nrgy );
DoLeech( damageGiven, m_From, m_Target );
if ( m_From != null ) // sanity check
{
DoLeech( damageGiven, m_From, m_Target );
}
WeightOverloading.DFA = DFAlgorithm.Standard;

View file

@ -42,6 +42,9 @@ namespace Server.Spells.Spellweaving
if( from == null || from.Backpack == null )
return null;
if ( from.Holding is ArcaneFocus )
return (ArcaneFocus)from.Holding;
return from.Backpack.FindItemByType<ArcaneFocus>();
}