public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-07 15:28:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Dungeon): Small corrections to Boss Novos encounter and some npcs wrong behavior (#2266)

Browse Source
This commit is contained in:
GMKyle
2019-09-16 16:10:29 -04:00
committed by Stoabrogga
parent 9022eea128
commit c9662f6c5e
2 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
data/sql/updates/pending_db_world/rev_1567713200326299359.sql Normal file
View File

@@ -0,0 +1,32 @@
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1567713200326299359');
UPDATE `creature_template` SET `flags_extra`= 0 WHERE `entry` IN (26638,31351);
UPDATE `creature_template` SET `faction`= 16 WHERE `entry` IN (26620,31339);
DELETE FROM `creature_addon` WHERE `guid` = 127438;
INSERT INTO `creature_addon` (`guid`, `bytes2`, `emote`) VALUES
(127438, 1, 36);
DELETE FROM `smart_scripts` WHERE `entryorguid`= 26623 AND `id` IN (10,11);
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-127591,-127590,-127589,-127582,-127580,-127579,-127578);
DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127590,127580,127449,127579);
INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
(127590, 127590, 0, 0, 3, 0, 0),
(127590, 127438, 0, 0, 3, 0, 0),
(127590, 127617, 0, 0, 3, 0, 0),
(127590, 127589, 0, 0, 3, 0, 0),
(127580, 127580, 0, 0, 3, 0, 0),
(127580, 127427, 0, 0, 3, 0, 0),
(127580, 127428, 0, 0, 3, 0, 0),
(127449, 127449, 0, 0, 3, 0, 0),
(127449, 127451, 0, 0, 3, 0, 0),
(127449, 127591, 0, 0, 3, 0, 0),
(127449, 127582, 0, 0, 3, 0, 0),
(127579, 127579, 0, 0, 3, 0, 0),
(127579, 127578, 0, 0, 3, 0, 0),
(127579, 127432, 0, 0, 3, 0, 0),
(127579, 127433, 0, 0, 3, 0, 0);

41
src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
View File

@@ -38,6 +38,7 @@ enum Misc
{
NPC_CRYSTAL_CHANNEL_TARGET = 26712,
NPC_CRYSTAL_HANDLER = 26627,
NPC_SUMMON_CRYSTAL_HANDLER_TARGET = 27583,
EVENT_SUMMON_FETID_TROLL = 1,
EVENT_SUMMON_SHADOWCASTER = 2,
@@ -46,7 +47,18 @@ enum Misc
EVENT_CAST_OFFENSIVE_SPELL = 5,
EVENT_KILL_TALK = 6,
EVENT_CHECK_PHASE = 7,
EVENT_SPELL_SUMMON_MINIONS = 8
EVENT_SPELL_SUMMON_MINIONS = 8,
ROOM_RIGHT = 0,
ROOM_LEFT = 1,
ROOM_STAIRS = 2
};
std::unordered_map<uint32, std::tuple <uint32, Position>> const npcSummon =
{
{ ROOM_RIGHT, { NPC_SUMMON_CRYSTAL_HANDLER_TARGET, { -341.31f, -724.40f, 28.57f, 0.0f } } },
{ ROOM_LEFT, { NPC_SUMMON_CRYSTAL_HANDLER_TARGET, { -408.87f, -730.21f, 28.58f, 0.0f } } },
{ ROOM_STAIRS, { NPC_CRYSTAL_CHANNEL_TARGET, { -378.40f, -813.13f, 59.74f, 0.0f } } },
};
class boss_novos : public CreatureScript
@@ -65,7 +77,7 @@ class boss_novos : public CreatureScript
BossAI::Reset();
instance->SetBossState(DATA_NOVOS_CRYSTALS, IN_PROGRESS);
instance->SetBossState(DATA_NOVOS_CRYSTALS, NOT_STARTED);
_crystalCounter = 0;
_crystalCounter = _summonTargetRightGUID = _summonTargetLeftGUID = _stage = 0;
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -103,7 +115,23 @@ class boss_novos : public CreatureScript
me->CastSpell(me, SPELL_ARCANE_BLAST, true);
me->CastSpell(me, SPELL_ARCANE_FIELD, true);
me->CastSpell(me, SPELL_DESPAWN_CRYSTAL_HANDLER, true);
me->SummonCreature(NPC_CRYSTAL_CHANNEL_TARGET, -378.40f, -813.13f, 59.74f, 0.0f);
for (auto itr : npcSummon)
{
uint32 summonEntry;
Position summonPos;
std::tie(summonEntry, summonPos) = itr.second;
if (Creature *creature = me->SummonCreature(summonEntry, summonPos))
switch (itr.first)
{
case ROOM_LEFT:
_summonTargetLeftGUID = creature->GetGUID();
break;
case ROOM_RIGHT:
_summonTargetRightGUID = creature->GetGUID();
break;
}
}
me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
me->RemoveAllAuras();
@@ -164,8 +192,9 @@ class boss_novos : public CreatureScript
{
Talk(SAY_SUMMONING_ADDS);
Talk(EMOTE_SUMMONING_ADDS);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f))
if (Creature* target = ObjectAccessor::GetCreature(*me, _stage ? _summonTargetLeftGUID : _summonTargetRightGUID))
target->CastSpell(target, SPELL_SUMMON_CRYSTAL_HANDLER, true, NULL, NULL, me->GetGUID());
_stage = _stage ? 0 : 1;
events.ScheduleEvent(EVENT_SUMMON_CRYSTAL_HANDLER, 20000);
}
break;
@@ -210,6 +239,10 @@ class boss_novos : public CreatureScript
private:
uint8 _crystalCounter;
uint8 _stage;
uint64 _summonTargetRightGUID;
uint64 _summonTargetLeftGUID;
bool _achievement;
};