mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into 320

Browse source
This commit is contained in:
tomrus88 2009-09-10 16:07:26 +04:00
commit b96e4bfed7
5 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/game/Spell.cpp
View file

@ -2429,7 +2429,6 @@ void Spell::cast(bool skipCheck)
switch(m_spellInfo->Id) switch(m_spellInfo->Id)
{ {
case 47585: AddPrecastSpell(60069); break; // Dispersion (transform)
case 15237: AddTriggeredSpell(23455); break;// Holy Nova, rank 1 case 15237: AddTriggeredSpell(23455); break;// Holy Nova, rank 1
case 15430: AddTriggeredSpell(23458); break;// Holy Nova, rank 2 case 15430: AddTriggeredSpell(23458); break;// Holy Nova, rank 2
case 15431: AddTriggeredSpell(23459); break;// Holy Nova, rank 3 case 15431: AddTriggeredSpell(23459); break;// Holy Nova, rank 3

32
src/game/SpellAuras.cpp
View file

@ -3031,22 +3031,28 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
} }
else else
{ {
uint32 model_id;
CreatureInfo const * ci = objmgr.GetCreatureTemplate(m_modifier.m_miscvalue); CreatureInfo const * ci = objmgr.GetCreatureTemplate(m_modifier.m_miscvalue);
if (!ci) if (!ci)
{ {
//pig pink ^_^ model_id = 16358; // pig pink ^_^
m_target->SetDisplayId(16358);
sLog.outError("Auras: unknown creature id = %d (only need its modelid) Form Spell Aura Transform in Spell ID = %d", m_modifier.m_miscvalue, GetId()); sLog.outError("Auras: unknown creature id = %d (only need its modelid) Form Spell Aura Transform in Spell ID = %d", m_modifier.m_miscvalue, GetId());
} }
else else
{ model_id = ci->DisplayID_A[0]; // Will use the default model here
// Will use the default model here
m_target->SetDisplayId(ci->DisplayID_A[0]);
// Dragonmaw Illusion (set mount model also) // Polymorph (sheep/penguin case)
if(GetId()==42016 && m_target->GetMountID() && !m_target->GetAurasByType(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED).empty()) if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && GetSpellProto()->SpellIconID == 82)
m_target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314); if (Unit* caster = GetCaster())
} if (caster->HasAura(52648)) // Glyph of the Penguin
model_id = 26452;
m_target->SetDisplayId(model_id);
// Dragonmaw Illusion (set mount model also)
if(GetId()==42016 && m_target->GetMountID() && !m_target->GetAurasByType(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED).empty())
m_target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314);
} }
// update active transform spell only not set or not overwriting negative by positive case // update active transform spell only not set or not overwriting negative by positive case
@ -5697,6 +5703,14 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
} }
break; break;
} }
case SPELLFAMILY_PRIEST:
// Dispersion mana reg and immunity
if (GetSpellProto()->Id == 47585)
{
spellId1 = 60069;
spellId2 = 63230;
}
break;
case SPELLFAMILY_ROGUE: case SPELLFAMILY_ROGUE:
// Sprint (skip non player casted spells by category) // Sprint (skip non player casted spells by category)
if (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000040) && GetSpellProto()->Category == 44) if (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000040) && GetSpellProto()->Category == 44)

9
src/game/SpellMgr.cpp
View file

@ -477,8 +477,13 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex)
return false; return false;
break; break;
case SPELL_AURA_MOD_PACIFY_SILENCE: case SPELL_AURA_MOD_PACIFY_SILENCE:
if(spellproto->Id == 24740) // Wisp Costume switch(spellproto->Id)
return true; {
case 24740: // Wisp Costume
case 47585: // Dispersion
return true;
default: break;
}
return false; return false;
case SPELL_AURA_MOD_ROOT: case SPELL_AURA_MOD_ROOT:
case SPELL_AURA_MOD_SILENCE: case SPELL_AURA_MOD_SILENCE:

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8482" #define REVISION_NR "8485"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__

1
win/.gitignore vendored
View file

@ -13,4 +13,5 @@
*.ncb *.ncb
*.suo *.suo
*.sdf *.sdf
*.sln.cache
ipch ipch