*Added defines for Sunwell Plateau

--HG--
branch : trunk

3 files changed, 22 insertions, 0 deletions

diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp
index 2d8b4f7c31b..71dededae54 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp
@@ -51,6 +51,11 @@ EndScriptData */
 #define SPELL_BERSERK                   26662
 #define SPELL_DUAL_WIELD                42459
 
+#define FREEZING 45203
+#define FROST_BOLT 44843
+#define ENCAPSULATE 45665
+#define ENCAPSULATE_CHANELLING 45661
+
 struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
 {
     boss_brutallusAI(Creature *c) : ScriptedAI(c)
@@ -66,6 +71,9 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
     uint32 StompTimer;
     uint32 BerserkTimer;
 
+	uint32 ConversationTimer;
+	bool Intro;
+
     void Reset()
     {
         SlashTimer = 11000;
@@ -73,11 +81,17 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
         BurnTimer = 60000;
         BerserkTimer = 360000;
         m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true);
+
+		if(pInstance)
+			pInstance->SetData(DATA_BRUTALLUS, NOT_STARTED);
     }
 
     void Aggro(Unit *who)
     {
 		DoScriptText(YELL_AGGRO, m_creature);
+
+		if(pInstance)
+			pInstance->SetData(DATA_BRUTALLUS, IN_PROGRESS);
     }
 
     void KilledUnit(Unit* victim)
@@ -93,6 +107,9 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
     void JustDied(Unit* Killer)
     {
 		DoScriptText(YELL_DEATH, m_creature);
+
+		if(pInstance)
+			pInstance->SetData(DATA_BRUTALLUS, DONE);
     }
 
     void UpdateAI(const uint32 diff)
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h b/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h
index 4ded3e5f47d..95ff1f112bf 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h
@@ -18,6 +18,7 @@
 #define DATA_KALECGOS_HUMAN         7
 #define DATA_SATHROVARR             8
 #define DATA_BRUTALLUS              9
+#define DATA_MADRIGOSA				24
 #define DATA_FELMYST                10
 #define DATA_ALYTHESS               11
 #define DATA_SACROLASH              12
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp
index f5772840c89..3de2c14e93a 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp
@@ -34,6 +34,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
     uint64 Kalecgos_Human;
     uint64 Sathrovarr;
     uint64 Brutallus;
+	uint64 Madrigosa;
     uint64 Felmyst;
     uint64 Alythess;
     uint64 Sacrolash;
@@ -58,6 +59,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
         Kalecgos_Human          = 0;
         Sathrovarr              = 0;
         Brutallus               = 0;
+		Madrigosa				= 0;
         Felmyst                 = 0;
         Alythess                = 0;
         Sacrolash               = 0;
@@ -100,6 +102,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
             case 24891: Kalecgos_Human      = creature->GetGUID(); break;
             case 24892: Sathrovarr          = creature->GetGUID(); break;
             case 24882: Brutallus           = creature->GetGUID(); break;
+			case 24895: Madrigosa			= creature->GetGUID(); break;
             case 25038: Felmyst             = creature->GetGUID(); break;
             case 25166: Alythess            = creature->GetGUID(); break;
             case 25165: Sacrolash           = creature->GetGUID(); break;
@@ -147,6 +150,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
             case DATA_KALECGOS_HUMAN:       return Kalecgos_Human;      break;
             case DATA_SATHROVARR:           return Sathrovarr;          break;
             case DATA_BRUTALLUS:            return Brutallus;           break;
+			case DATA_MADRIGOSA:			return Madrigosa;			break;
             case DATA_FELMYST:              return Felmyst;             break;
             case DATA_ALYTHESS:             return Alythess;            break;
             case DATA_SACROLASH:            return Sacrolash;           break;