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

Core/Packets: CMSG_CREATURE_QUERY and SMSG_CREATURE_QUERY_RESPONSE handler

Browse Source
This commit is contained in:
Intel
2014-11-14 01:55:29 +00:00
committed by Nayd
parent 231207970b
commit b08b54c8bb
24 changed files with 246 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
View File

@@ -119,7 +119,7 @@ class boss_corborus : public CreatureScript
events.ScheduleEvent(EVENT_CORBORUS_CHARGE, 1000);
break;
}
}
default:
break;
}
@@ -192,7 +192,7 @@ class boss_corborus : public CreatureScript
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
DoCast(me, SPELL_CLEAR_ALL_DEBUFFS);
me->AttackStop();
DoCast(me, SPELL_SUBMERGE);
countTrashingCharge = 0;
@@ -298,7 +298,7 @@ class npc_rock_borer : public CreatureScript
break;
}
}
DoMeleeAttackIfReady();
}

6
src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
View File

@@ -102,7 +102,7 @@ class boss_ozruk : public CreatureScript
void JustSummoned(Creature* summon) override
{
if (summon->GetEntry() != NPC_RUPTURE_CONTROLLER)
if (summon->GetEntry() != NPC_RUPTURE_CONTROLLER)
return;
summon->SetReactState(REACT_PASSIVE);
@@ -161,7 +161,7 @@ class boss_ozruk : public CreatureScript
me->AttackStop();
DoCast(me, SPELL_SHATTER);
events.ScheduleEvent(EVENT_START_ATTACK, 4600);
// Spells are cast in same order everytime after Shatter, so we schedule them here
// Spells are cast in same order everytime after Shatter, so we schedule them here
events.ScheduleEvent(EVENT_ELEMENTIUM_BULWARK, urand(3000,4000));
events.ScheduleEvent(EVENT_GROUND_SLAM, urand(7000,9000));
events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, urand(10000,12000));
@@ -178,7 +178,7 @@ class boss_ozruk : public CreatureScript
}
void RemoveBouncerSpikes()
{
{
Vehicle* vehicle = me->GetVehicleKit();
if (!vehicle)
return;

10
src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
View File

@@ -46,7 +46,7 @@ enum Spells
};
enum Entries
{
{
NPC_LAVA_FISSURE = 43242,
NPC_STALACTITE_TRIGGER_GROUND = 43357,
NPC_STALACTITE_TRIGGER = 43159,
@@ -174,7 +174,7 @@ class boss_slabhide : public CreatureScript
{
if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE)
return;
switch (id)
{
case POINT_SLABHIDE_INTRO:
@@ -295,7 +295,7 @@ class boss_slabhide : public CreatureScript
for (std::list<GameObject*>::const_iterator itr = listStalactite.begin(); itr != listStalactite.end(); ++itr)
(*itr)->Delete();
}
EventMap events;
};
@@ -570,7 +570,7 @@ public:
caster->GetGameObjectListWithEntryInGrid(goList, GO_STALACTITE, 40.0f);
if (goList.empty())
return;
unitList.remove_if(BehindObjectCheck(caster, goList));
}
@@ -595,5 +595,5 @@ void AddSC_boss_slabhide()
new spell_s81028_s80650_stalactite();
new spell_stalactite_mod_dest_height();
new spell_s92306_crystal_storm();
new spell_s92300_crystal_storm();
new spell_s92300_crystal_storm();
}

2
src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
View File

@@ -246,7 +246,7 @@ class instance_stonecore : public InstanceMapScript
ObjectGuid highPriestessAzilGUID;
ObjectGuid stonecoreTeleporterGUID[2];
GuidVector slabhideRockWallGUIDs;
EncounterState slabhideIntro;
};

4
src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
View File

@@ -49,7 +49,7 @@ enum Spells
SPELL_TIGULE_AND_FORORS_SPECIAL_BLEND = 81220,
SPELL_IMPENDING_DOOM = 86838,
SPELL_IMPENDING_DOOM_CHANNEL = 86830,
// SPELL_PORTAL_VISUAL = 79754,
};
@@ -340,7 +340,7 @@ class spell_sc_twilight_documents : public SpellScriptLoader
return false;
return true;
}
void SetTarget(WorldObject*& target)
{
target = GetCaster()->FindNearestCreature(NPC_GENERIC_TRIGGER_LAB, 100.0f);

2
src/server/scripts/Spells/spell_quest.cpp
View File

@@ -2426,7 +2426,7 @@ public:
void HandleDummyEffect()
{
Unit* caster = GetCaster();
if (Creature* injuredStormwindInfantry = caster->FindNearestCreature(NPC_INJURED_STORMWIND_INFANTRY, 5.0f, true))
{
injuredStormwindInfantry->SetCreatorGUID(caster->GetGUID());