*Wintergrasp: Prevent defenders team to click the relic. Patch by Spp.

*Zum'Rah Area Trigger Script, Zum'Rah should become hostile when approached. By totoro.
*Judgement of Light PPM based, not 100%. By Drevi.
*Fix Deflection Exploit. By manuel, thanks to TheNecromancer and Gyullo.
*Correct Wintergrasp Tenacity formulas, by Gyullo.
*A Spirit Guide Escort Quest, code from SD2, patch by manuel.
*TrullyOne/MeanMachine Waypoint System Restored. Patch by XTElite1.

--HG--
branch : trunk

2 files changed, 33 insertions, 6 deletions

diff --git a/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp
index 8c6442ade4f..2ac360faa09 100644
--- a/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp
@@ -228,6 +228,25 @@ bool GOHello_go_shallow_grave(Player* pPlayer, GameObject* pGo)
     return false;
 }
 
+/*######
+## at_zumrah
+######*/
+
+enum {
+    ZUMRAH_ID = 7271,
+    ZUMRAH_HOSTILE_FACTION = 37
+};
+
+bool AreaTrigger_at_zumrah(Player* pPlayer, AreaTriggerEntry *at)
+{
+        Creature* Zumrah = pPlayer->FindNearestCreature(ZUMRAH_ID, 30.0f);
+
+        if (!Zumrah)
+            return false;
+
+        Zumrah->setFaction(ZUMRAH_HOSTILE_FACTION);
+}
+
 void AddSC_zulfarrak()
 {
     Script *newscript;
@@ -250,4 +269,10 @@ void AddSC_zulfarrak()
     newscript->Name="go_shallow_grave";
     newscript->pGOHello = &GOHello_go_shallow_grave;
     newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "at_zumrah";
+    newscript->pAreaTrigger = &AreaTrigger_at_zumrah;
+    newscript->RegisterSelf();
+
 }
diff --git a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp
index c5cae7e7412..30e835711a4 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp
@@ -17,12 +17,13 @@
 /* ScriptData
 SDName: Hellfire_Peninsula
 SD%Complete: 100
- SDComment: Quest support: 9375, 9418, 10129, 10146, 10162, 10163, 10340, 10346, 10347, 10382 (Special flight paths)
+SDComment: Quest support: 9375, 9410, 9418, 10129, 10146, 10162, 10163, 10340, 10346, 10347, 10382 (Special flight paths)
 SDCategory: Hellfire Peninsula
 EndScriptData */
 
 /* ContentData
 npc_aeranas
+npc_ancestral_wolf
 go_haaleshi_altar
 npc_naladu
 npc_tracy_proudwell
@@ -337,20 +338,21 @@ bool QuestAccept_npc_wounded_blood_elf(Player* pPlayer, Creature* pCreature, Que
     return true;
 }
 
-/*######
-##
-######*/
-
 void AddSC_hellfire_peninsula()
 {
     Script *newscript;
 
     newscript = new Script;
-     newscript->Name = "npc_aeranas";
+    newscript->Name = "npc_aeranas";
     newscript->GetAI = &GetAI_npc_aeranas;
     newscript->RegisterSelf();
 
     newscript = new Script;
+    newscript->Name = "npc_ancestral_wolf";
+    newscript->GetAI = &GetAI_npc_ancestral_wolf;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
     newscript->Name = "go_haaleshi_altar";
     newscript->pGOHello = &GOHello_go_haaleshi_altar;
     newscript->RegisterSelf();