diff options
| -rw-r--r-- | sql/FULL/world_spell_full.sql | 5 | ||||
| -rw-r--r-- | sql/updates/5185_world_scripts_dk.sql | 4 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp | 20 |
3 files changed, 5 insertions, 24 deletions
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql index bdaf18be723..7661684f454 100644 --- a/sql/FULL/world_spell_full.sql +++ b/sql/FULL/world_spell_full.sql @@ -2053,11 +2053,6 @@ insert into spell_script_target values (53706, 1, 29183); insert into spell_script_target values (53677, 1, 29227); insert into spell_script_target values (53685, 1, 29175); -DELETE FROM `gameobject` WHERE `id` IN (191330); -INSERT INTO `gameobject` (`id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES -('','609','1','128','2283.896','-5287.914','83.066','1','0.0','0.0','0.0','1.0','180','0','1'); - - -- -------- -- NAXXARAMAS -- -------- diff --git a/sql/updates/5185_world_scripts_dk.sql b/sql/updates/5185_world_scripts_dk.sql index 1539ae33b00..58016cbeb37 100644 --- a/sql/updates/5185_world_scripts_dk.sql +++ b/sql/updates/5185_world_scripts_dk.sql @@ -11,10 +11,6 @@ insert into spell_script_target values (53706, 1, 29183); insert into spell_script_target values (53677, 1, 29227); insert into spell_script_target values (53685, 1, 29175); -DELETE FROM `gameobject` WHERE `id` IN (191330); -INSERT INTO `gameobject` (`id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES -('','609','1','128','2283.896','-5287.914','83.066','1','0.0','0.0','0.0','1.0','180','0','1'); - UPDATE creature_template SET unit_flags=32768,AIName='EventAI' WHERE entry IN (29199,29204,29200,29174,29182,29186,29190,29219,29206,29176,29178,29179,29180,29177,29181); DELETE FROM creature_ai_scripts WHERE creature_id IN (29199,29204,29200,29174,29182,29186,29190,29219,29206,29176,29178,29179,29180,29177,29181); INSERT INTO `creature_ai_scripts` VALUES ('2919901', '29199', '0', '0', '100', '3', '10000', '20000', '10000', '20000', '11', '52374', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'Koltira Deathweaver - SPELL_BLOOD_STRIKE1'); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp index 2fa531181fa..9fd818b7c99 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp @@ -330,9 +330,6 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI uint64 uiGhoulGUID[ENCOUNTER_GHOUL_NUMBER]; uint64 uiWarriorGUID[ENCOUNTER_WARRIOR_NUMBER]; - // Misc - uint64 uiDawnofLightGUID; - void Reset() { if (!IsBeingEscorted) @@ -345,8 +342,6 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI uiTotal_scourge = ENCOUNTER_TOTAL_SCOURGE; uiSummon_counter = 0; - uiDawnofLightGUID = 0; - uiAnti_magic_zone = 1000 + rand()%5000; uiDeath_strike = 5000 + rand()%5000; uiDeath_embrace = 5000 + rand()%5000; @@ -477,12 +472,6 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI case 1: SetHoldState(true); - if (GameObject* pGo = me->FindNearestGameObject(GO_LIGHT_OF_DAWN, 100.0f)) // make dawn of light effect off - { - uiDawnofLightGUID = pGo->GetGUID(); - pGo->SetPhaseMask(0, true); - } - SpawnNPC(); if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID)) DoScriptText(SAY_LIGHT_OF_DAWN07, pTemp); @@ -1098,8 +1087,9 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI break; case 48: // Show the cleansing effect (dawn of light) - if (GameObject* pGo = me->GetMap()->GetGameObject(uiDawnofLightGUID)) - pGo->SetPhaseMask(128, true); + //if (GameObject* pGo = me->GetMap()->GetGameObject(uiDawnofLightGUID)) + // pGo->SetPhaseMask(128, true); + me->SummonGameObject(GO_LIGHT_OF_DAWN, 2283.896, -5287.914, 83.066, 0, 0, 0, 0, 0, 30000); if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) { if (pTemp->HasAura(SPELL_REBIRTH_OF_THE_ASHBRINGER, 0)) @@ -1273,8 +1263,8 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI break; case 71: - if (GameObject* pGo = me->GetMap()->GetGameObject(uiDawnofLightGUID)) // Turn off dawn of light - pGo->SetPhaseMask(0, true); + //if (GameObject* pGo = me->GetMap()->GetGameObject(uiDawnofLightGUID)) // Turn off dawn of light + // pGo->SetPhaseMask(0, true); { Map *map = me->GetMap(); // search players with in 50 yards for quest credit |