*Merge with 499.

--HG--
branch : trunk

sql/updates/285_world.sql

@@ -1,4 +1,4 @@
--- general stuff
+-- general stuff
 
 REPLACE INTO gameobject_template VALUES (178364,1,5773,"Horde Banner","",84,0,1,0,1479,196608,180101,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"");
 REPLACE INTO gameobject_template VALUES (178365,1,5771,"Alliance Banner","",83,0,1,0,1479,196608,180100,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"");
@@ -18,7 +18,7 @@ REPLACE INTO gameobject_template VALUES (180423,6,266,"Neutral Banner Aura, Larg
 REPLACE INTO gameobject_template VALUES (180424,0,3751,"Alterac Valley Gate","",100,0,3.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"");
 
 -- following is the player loot.. it takes the id 1 - be sure that i don't delete anything
-REPLACE INTO `world`.`creature_loot_template` (`entry` ,`item` ,`ChanceOrQuestChance` ,`groupid` ,`mincountOrRef` ,`maxcount` ,`lootcondition` ,`condition_value1` ,`condition_value2`)
+REPLACE INTO `creature_loot_template` (`entry` ,`item` ,`ChanceOrQuestChance` ,`groupid` ,`mincountOrRef` ,`maxcount` ,`lootcondition` ,`condition_value1` ,`condition_value2`)
 VALUES ('1', '17306', '33', '0', '5', '15',  '6', '67', '0'),
 ('1', '17422', '100', '0', '20', '40', '0', '0', '0'),
 ('1', '17423', '33', '0', '5', '15',  '6', '469', '0'),

sql/updates/488_trinity_script_text.sql

@@ -363,7 +363,7 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
 (-1509014,'Warriors! Captains! Continue the fight!',8613,1,0,'rajaxx SAY_UNK4'),
 (-1509015,'You are not worth my time $N!',8614,1,0,'rajaxx SAY_DEAGGRO'),
 (-1509016,'Breath your last!',8604,1,0,'rajaxx SAY_KILLS_ANDOROV'),
-(-1509017,'Soon you will know the price of your meddling, mortals... The master is nearly whole... And when he rises, your world will be cease!',0,1,0,'rajaxx SAY_COMPLETE_QUEST');
+(-1509017,'Soon you will know the price of your meddling, mortals... The master is nearly whole... And when he rises, your world will be cease!',0,1,0,'rajaxx SAY_COMPLETE_QUEST'),
 (-1509018,'I am rejuvinated!',8593,1,0,'ossirian SAY_SURPREME1'),
 (-1509019,'My powers are renewed!',8595,1,0,'ossirian SAY_SURPREME2'),
 (-1509020,'My powers return!',8596,1,0,'ossirian SAY_SURPREME3'),

src/bindings/scripts/VC71/71ScriptDev2.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="7,10"
 	Name="TrinityScript"
 	ProjectGUID="{4295C8A9-79B7-4354-8064-F05FB9CA0C96}"
 	RootNamespace="ScriptDev2"

src/bindings/scripts/VC80/80ScriptDev2.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="8,00"
 	Name="TrinityScript"
 	ProjectGUID="{4295C8A9-79B7-4354-8064-F05FB9CA0C96}"
 	RootNamespace="ScriptDev2"

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp

@@ -56,7 +56,7 @@ EndScriptData */
 #define SPELL_ENRAGE                27680                   //this spell need verification
 #define SPELL_SUMMON_WATER_ELEMENT  36459                   //not in use yet(in use ever?)
 #define SPELL_ELEMENTAL_SPAWNIN     25035
-#define SPELL_BLUE_BEAM             /*40227*/38015                   //channeled Hydross Beam Helper (not in use yet)
+#define SPELL_BLUE_BEAM             /*40227*/40227                   //channeled Hydross Beam Helper (not in use yet)
 
 #define ENTRY_PURE_SPAWN            22035
 #define ENTRY_TAINTED_SPAWN         22036

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp

@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
         Entangle_Timer = 30000;
         StaticCharge_Timer = 10000+rand()%15000;
         ForkedLightning_Timer = 2000;
-        Check_Timer = 1000;
+        Check_Timer = 15000;
         EnchantedElemental_Timer = 5000;
         TaintedElemental_Timer = 50000;
         CoilfangElite_Timer = 45000+rand()%5000;
@@ -468,7 +468,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
                 if(!InMeleeRange)
                     CastShootOrMultishot();
 
-                Check_Timer = 1000;
+                Check_Timer = 5000;
             }else Check_Timer -= diff;
         }
         //Phase 2

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp

@@ -17,7 +17,7 @@
 /* ScriptData
 SDName: boss_the_lurker_below
 SD%Complete: 80
-SDComment:
+SDComment: Scalding Water other things.
 SDCategory: The Lurker Below
 EndScriptData */
 

src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp

@@ -1,4 +1,4 @@
-tet/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
+/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or

src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp

@@ -444,8 +444,7 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI
                 DoCast(target, SPELL_MANA_BURN);
                 ManaBurnTimer = 8000 + (rand()%10 * 1000); // 8-18 sec cd
             }
-        }
+        }else ManaBurnTimer -= diff;
-        else ManaBurnTimer -= diff;
 
         if(!Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) && target->GetQuestStatus(10190) == QUEST_STATUS_INCOMPLETE) // start: support for quest 10190
         {
@@ -473,6 +472,8 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI
                 DrainedPhaseHunter->AI()->AttackStart(target);
             }
         } // end: support for quest 10190
+
+		DoMeleeAttackIfReady();
     }
 
 };

src/game/RandomMovementGenerator.cpp

@@ -27,6 +27,17 @@
 
 #define RUNNING_CHANCE_RANDOMMV 20                                  //will be "1 / RUNNING_CHANCE_RANDOMMV"
 
+template<>
+bool 
+RandomMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const
+{
+    if(i_destinationHolder.HasArrived())
+        return false; 
+    
+    i_destinationHolder.GetDestination(x, y, z); 
+    return true;
+}
+
 template<>
 void
 RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)

src/game/RandomMovementGenerator.h

@@ -38,6 +38,7 @@ class TRINITY_DLL_SPEC RandomMovementGenerator
         void Finalize(T &) {}
         void Reset(T &);
         bool Update(T &, const uint32 &);
+        bool GetDestination(float &x, float &y, float &z) const;
 		void UpdateMapPosition(uint32 mapid, float &x ,float &y, float &z)
         {
             i_destinationHolder.GetLocationNow(mapid, x,y,z);

src/game/Unit.cpp

@@ -8632,6 +8632,11 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
 			{
 				CastingTime = 0;
 			}
+			// Darkmoon Card: Vengeance - 0.1%
+			else if (spellProto->SpellVisual == 9850 && spellProto->SpellIconID == 2230)
+			{
+				CastingTime = 3.5;
+			}
         case SPELLFAMILY_MAGE:
             // Ignite - do not modify, it is (8*Rank)% damage of procing Spell
             if(spellProto->Id==12654)