Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 08:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
Vincent-Michael
2014-08-30 05:03:47 +02:00
parent 06daf22e1e 831a6603d4
commit f89739dab5
16 changed files with 4197 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
View File

@@ -20,27 +20,32 @@
enum Spells
{
SPELL_ARCANE_EXPLOSION = 46608,
SPELL_CONE_OF_COLD = 38384,
SPELL_FIREBALL = 46988,
SPELL_FROSTBOLT = 46987
SPELL_ARCANE_EXPLOSION = 46608,
SPELL_CONE_OF_COLD = 38384,
SPELL_FIREBALL = 46988,
SPELL_FROSTBOLT = 46987
};
enum Yells
{
YELL_AGGRO = 0,
YELL_EVADE = 1,
YELL_SALVATION = 2,
YELL_AGGRO = 0,
YELL_EVADE = 1,
YELL_SALVATION = 2,
};
enum Creatures
{
NPC_WATER_ELEMENTAL = 25040
NPC_WATER_ELEMENTAL = 25040
};
enum Action
{
ACTION_BUFF_YELL = -30001 // shared from Battleground
};
enum WaterElementalSpells
{
SPELL_WATERBOLT = 46983
SPELL_WATERBOLT = 46983
};
class npc_water_elemental : public CreatureScript
@@ -151,6 +156,12 @@ public:
summons.DespawnAll();
}
void DoAction(int32 actionId) override
{
if (actionId == ACTION_BUFF_YELL)
Talk(YELL_AGGRO);
}
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())

14
src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
View File

@@ -30,7 +30,13 @@ enum Spells
enum Yells
{
YELL_AGGRO = 0,
YELL_EVADE = 1
YELL_EVADE = 1,
YELL_BUFF = 2
};
enum Action
{
ACTION_BUFF_YELL = -30001 // shared from Battleground
};
class boss_galvangar : public CreatureScript
@@ -69,6 +75,12 @@ public:
Reset();
}
void DoAction(int32 actionId) override
{
if (actionId == ACTION_BUFF_YELL)
Talk(YELL_BUFF);
}
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())

8
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View File

@@ -1269,7 +1269,13 @@ class spell_putricide_mutated_plague : public SpellScriptLoader
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
uint32 healSpell = uint32(GetSpellInfo()->Effects[EFFECT_0].CalcValue());
GetTarget()->CastSpell(GetTarget(), healSpell, true, NULL, NULL, GetCasterGUID());
SpellInfo const* healSpellInfo = sSpellMgr->GetSpellInfo(healSpell);
if (!healSpellInfo)
return;
int32 heal = healSpellInfo->Effects[0].CalcValue() * GetStackAmount();
GetTarget()->CastCustomSpell(healSpell, SPELLVALUE_BASE_POINT0, heal, GetTarget(), true, NULL, NULL, GetCasterGUID());
}
void Register() override