diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp | 20 | ||||
| -rw-r--r-- | src/game/Pet.cpp | 5 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp index f2d4b0ce34a..35c7213d033 100644 --- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp +++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp @@ -110,6 +110,21 @@ bool GossipSelect_npc_rathis_tomber(Player *player, Creature *_Creature, uint32 return true; } +/*##### +## go_gilded_brazier (Paladin First Trail quest (9678)) +#####*/ + +bool GOHello_gilded_brazier(Player *player, GameObject* _GO) +{ + if (player->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE) + { + Creature *Stillblade = player->SummonCreature(17716, 8106.11, -7542.06, 151.775, 3.02598, TEMPSUMMON_DEAD_DESPAWN, 60000); + if (Stillblade) + ((CreatureAI*)Stillblade->AI())->AttackStart(player); + } + return true; +}; + void AddSC_ghostlands() { Script *newscript; @@ -131,4 +146,9 @@ void AddSC_ghostlands() newscript->pGossipHello = &GossipHello_npc_rathis_tomber; newscript->pGossipSelect = &GossipSelect_npc_rathis_tomber; m_scripts[nrscripts++] = newscript; + + newscript = new Script; + newscript->Name = "go_gilded_brazier"; + newscript->pGOHello = &GOHello_gilded_brazier; + m_scripts[nrscripts++] = newscript; } diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 01329fe5e89..4eaf047f96c 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -1657,6 +1657,11 @@ void Pet::ToggleAutocast(uint32 spellid, bool apply) if(IsPassiveSpell(spellid)) return; + if(const SpellEntry *tempSpell = GetSpellStore()->LookupEntry(spellid)) + if(tempSpell->EffectImplicitTargetA[0] != TARGET_ALL_AROUND_CASTER + || tempSpell->EffectImplicitTargetA[0] != TARGET_CHAIN_DAMAGE) + return; + PetSpellMap::const_iterator itr = m_spells.find((uint16)spellid); int i; |