pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-21 01:51:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed the MT_Shout to MT_SpellFailure in Mob::SpellOnTarget

Browse Source
This commit is contained in:
Michael Cook 2013-10-24 17:38:46 -04:00
parent 36d336e69c
commit 3c09613d01
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/spells.cpp
View File

@ -3014,7 +3014,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
if(IsDetrimentalSpell(spell_id) && !IsAttackAllowed(spelltar) && !IsResurrectionEffects(spell_id)) { if(IsDetrimentalSpell(spell_id) && !IsAttackAllowed(spelltar) && !IsResurrectionEffects(spell_id)) {
if(!IsClient() || !CastToClient()->GetGM()) { if(!IsClient() || !CastToClient()->GetGM()) {
Message_StringID(MT_Shout, SPELL_NO_HOLD); Message_StringID(MT_SpellFailure, SPELL_NO_HOLD);
return false; return false;
} }
} }
@ -3151,7 +3151,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
{ {
if(spelltar->invisible) if(spelltar->invisible)
{ {
spelltar->Message_StringID(MT_Shout, ALREADY_INVIS, GetCleanName()); spelltar->Message_StringID(MT_SpellFailure, ALREADY_INVIS, GetCleanName());
safe_delete(action_packet); safe_delete(action_packet);
return false; return false;
} }
@ -3161,7 +3161,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
{ {
if(spelltar->invisible_undead) if(spelltar->invisible_undead)
{ {
spelltar->Message_StringID(MT_Shout, ALREADY_INVIS, GetCleanName()); spelltar->Message_StringID(MT_SpellFailure, ALREADY_INVIS, GetCleanName());
safe_delete(action_packet); safe_delete(action_packet);
return false; return false;
} }
@ -3171,7 +3171,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
{ {
if(spelltar->invisible_animals) if(spelltar->invisible_animals)
{ {
spelltar->Message_StringID(MT_Shout, ALREADY_INVIS, GetCleanName()); spelltar->Message_StringID(MT_SpellFailure, ALREADY_INVIS, GetCleanName());
safe_delete(action_packet); safe_delete(action_packet);
return false; return false;
} }
@ -3252,7 +3252,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
mlog(SPELLS__CASTING_ERR, "Beneficial ae bard song %d can't take hold %s -> %s, IBA? %d", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar)); mlog(SPELLS__CASTING_ERR, "Beneficial ae bard song %d can't take hold %s -> %s, IBA? %d", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar));
} else { } else {
mlog(SPELLS__CASTING_ERR, "Beneficial spell %d can't take hold %s -> %s, IBA? %d", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar)); mlog(SPELLS__CASTING_ERR, "Beneficial spell %d can't take hold %s -> %s, IBA? %d", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar));
Message_StringID(MT_Shout, SPELL_NO_HOLD); Message_StringID(MT_SpellFailure, SPELL_NO_HOLD);
} }
safe_delete(action_packet); safe_delete(action_packet);
return false; return false;
@ -3262,7 +3262,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
else if ( !IsAttackAllowed(spelltar, true) && !IsResurrectionEffects(spell_id)) // Detrimental spells - PVP check else if ( !IsAttackAllowed(spelltar, true) && !IsResurrectionEffects(spell_id)) // Detrimental spells - PVP check
{ {
mlog(SPELLS__CASTING_ERR, "Detrimental spell %d can't take hold %s -> %s", spell_id, GetName(), spelltar->GetName()); mlog(SPELLS__CASTING_ERR, "Detrimental spell %d can't take hold %s -> %s", spell_id, GetName(), spelltar->GetName());
spelltar->Message_StringID(MT_Shout, YOU_ARE_PROTECTED, GetCleanName()); spelltar->Message_StringID(MT_SpellFailure, YOU_ARE_PROTECTED, GetCleanName());
safe_delete(action_packet); safe_delete(action_packet);
return false; return false;
} }
@ -3300,7 +3300,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
focus = CalcFocusEffect(focusBlockNextSpell, buffs[b].spellid, spell_id); focus = CalcFocusEffect(focusBlockNextSpell, buffs[b].spellid, spell_id);
if(focus) { if(focus) {
CheckHitsRemaining(b); CheckHitsRemaining(b);
Message_StringID(MT_Shout, SPELL_WOULDNT_HOLD); Message_StringID(MT_SpellFailure, SPELL_WOULDNT_HOLD);
safe_delete(action_packet); safe_delete(action_packet);
return false; return false;
} }
@ -3534,7 +3534,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
// spell. It's most likely a buff that can't stack. // spell. It's most likely a buff that can't stack.
mlog(SPELLS__CASTING_ERR, "Spell %d could not apply its effects %s -> %s\n", spell_id, GetName(), spelltar->GetName()); mlog(SPELLS__CASTING_ERR, "Spell %d could not apply its effects %s -> %s\n", spell_id, GetName(), spelltar->GetName());
if(casting_spell_type != 1) // AA is handled differently if(casting_spell_type != 1) // AA is handled differently
Message_StringID(MT_Shout, SPELL_NO_HOLD); Message_StringID(MT_SpellFailure, SPELL_NO_HOLD);
safe_delete(action_packet); safe_delete(action_packet);
return false; return false;
} }