From fa3d059737d20d452fec0ff0f30f2af74490460c Mon Sep 17 00:00:00 2001 From: Rushor Date: Sat, 31 Jan 2015 18:36:41 +0100 Subject: [PATCH 01/26] Scripts/SunkenTemple: Add Eventsupport for NPC: Malfurion Stormrage --- sql/updates/world/2015_01_31_01_world.sql | 32 +++++++++++++++++++ .../SunkenTemple/sunken_temple.cpp | 26 +++++++++------ 2 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/2015_01_31_01_world.sql diff --git a/sql/updates/world/2015_01_31_01_world.sql b/sql/updates/world/2015_01_31_01_world.sql new file mode 100644 index 0000000000..3df79d26da --- /dev/null +++ b/sql/updates/world/2015_01_31_01_world.sql @@ -0,0 +1,32 @@ +-- scriptsupport for questaccept of [Q] Eranikus, Tyrant of the Dream +-- Malfurion Stormrage SAI +SET @ENTRY := 15362; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,54,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Malfurion Stormrage - On Just Summoned - Remove Npc Flag Questgiver"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Malfurion Stormrage - On Just Summoned - Run Script"); + +-- Actionlist SAI +SET @ENTRY := 1536200; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,9,0,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"), +(@ENTRY,9,1,0,0,0,100,0,1500,1500,0,0,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Play Emote 2"), +(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 1"), +(@ENTRY,9,3,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 2"), +(@ENTRY,9,4,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 3"), +(@ENTRY,9,5,0,0,0,100,0,2000,2000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 4"), +(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Add Npc Flag Questgiver"); + +DELETE FROM `creature_text` WHERE `entry`=15362; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(15362, 0, 0, 'The walls of the chamber tremble. Something is happening...', 16, 0, 100, 0, 0, 0, 11191, 0, 'Malfurion Stormrage'), +(15362, 1, 0, 'Be steadfast, champion. I know why it is that you are here and I know what it is that you seek. Eranikus will not give up the shard freely. He has been twisted... twisted by the same force that you seek to destroy.', 12, 0, 100, 0, 0, 0, 11193, 0, 'Malfurion Stormrage'), +(15362, 2, 0, 'Are you really surprised? Is it hard to believe that the power of an Old God could reach even inside the Dream? It is true - Eranikus, Tyrant of the Dream, wages a battle against us all. The Nightmare follows in his wake of destruction.', 12, 0, 100, 0, 0, 0, 11194, 0, 'Malfurion Stormrage'), +(15362, 3, 0, 'Understand this, Eranikus wants nothing more than to be brought to Azeroth from the Dream. Once he is out, he will stop at nothing to destroy my physical manifestation. This, however, is the only way in which you could recover the scepter shard.', 12, 0, 100, 0, 0, 0, 11195, 0, 'Malfurion Stormrage'), +(15362, 4, 0, 'You will bring him back into this world, champion.', 12, 0, 100, 0, 0, 0, 11196, 0, 'Malfurion Stormrage'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=15362; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22, 1, 15362, 0, 0, 23, 0, 1477, 0, 0, 0, 0, 0, '', 'Malfurion Stormrage - Only run SAI in the Sunken Temple'); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 3ced85f09a..97be139cef 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -36,19 +36,27 @@ EndContentData */ # at_malfurion_Stormrage_trigger #####*/ +enum MalfurionMisc +{ + NPC_MALFURION_STORMRAGE = 15362, + QUEST_ERANIKUS_TYRANT_OF_DREAMS = 8733, + QUEST_THE_CHARGE_OF_DRAGONFLIGHTS = 8555, +}; + class at_malfurion_stormrage : public AreaTriggerScript { -public: - at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { } - - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override - { - if (player->GetInstanceScript() && !player->FindNearestCreature(15362, 15)) - player->SummonCreature(15362, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); - return false; - } + public: + at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { } + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override + { + if (player->GetInstanceScript() && !player->FindNearestCreature(NPC_MALFURION_STORMRAGE, 15.0f) && + player->GetQuestStatus(QUEST_THE_CHARGE_OF_DRAGONFLIGHTS) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_ERANIKUS_TYRANT_OF_DREAMS) != QUEST_STATUS_REWARDED) + player->SummonCreature(NPC_MALFURION_STORMRAGE, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); + return false; + } }; + /*##### # go_atalai_statue #####*/ From 61557ee7c6a4bdf844b7bcfef552908c83b4e297 Mon Sep 17 00:00:00 2001 From: Kittnz Date: Sat, 14 Mar 2015 23:25:19 +0100 Subject: [PATCH 02/26] Core: Move FillCirclePath function to MotionMaster --- src/server/game/Movement/MotionMaster.cpp | 37 ++++++++++++++++ src/server/game/Movement/MotionMaster.h | 1 + .../HallsOfReflection/halls_of_reflection.cpp | 23 +--------- .../Nexus/EyeOfEternity/boss_malygos.cpp | 43 +------------------ .../Ulduar/Ulduar/boss_yogg_saron.cpp | 21 +-------- 5 files changed, 42 insertions(+), 83 deletions(-) diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 47e5b77a0d..bda3ad851c 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -387,6 +387,43 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee Mutate(new EffectMovementGenerator(id), MOTION_SLOT_CONTROLLED); } +void MotionMaster::MoveCirclePath(float x, float y, float z, float radius, bool clockwise, uint8 stepCount) +{ + float step = 2 * float(M_PI) / stepCount * (clockwise ? -1.0f : 1.0f); + Position const& pos = { x, y, z, 0.0f }; + float angle = pos.GetAngle(_owner->GetPositionX(), _owner->GetPositionY()); + + Movement::MoveSplineInit init(_owner); + + for (uint8 i = 0; i < stepCount; angle += step, ++i) + { + G3D::Vector3 point; + point.x = x + radius * cosf(angle); + point.y = y + radius * sinf(angle); + + if (_owner->IsFlying()) + point.z = z; + else + point.z = _owner->GetMap()->GetHeight(_owner->GetPhaseMask(), point.x, point.y, z); + + init.Path().push_back(point); + } + + if (_owner->IsFlying()) + { + init.SetFly(); + init.SetCyclic(); + init.SetAnimation(Movement::ToFly); + } + else + { + init.SetWalk(true); + init.SetCyclic(); + } + + init.Launch(); +} + void MotionMaster::MoveFall(uint32 id /*=0*/) { // use larger distance for vmap height search than in most other cases diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 2821cd5a59..0b547d96e7 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -184,6 +184,7 @@ class MotionMaster //: private std::stack void MoveJump(Position const& pos, float speedXY, float speedZ, uint32 id = EVENT_JUMP) { MoveJump(pos.m_positionX, pos.m_positionY, pos.m_positionZ, speedXY, speedZ, id); }; void MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id = EVENT_JUMP); + void MoveCirclePath(float x, float y, float z, float radius, bool clockwise, uint8 stepCount); void MoveFall(uint32 id = 0); void MoveSeekAssistance(float x, float y, float z); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 9edde447f3..927ebfbc55 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -2640,13 +2640,7 @@ class npc_quel_delar_sword : public CreatureScript break; case EVENT_QUEL_DELAR_FLIGHT: { - Movement::MoveSplineInit init(me); - FillCirclePath(QuelDelarCenterPos, 18.0f, 718.046f, init.Path(), true); - init.SetFly(); - init.SetCyclic(); - init.SetAnimation(Movement::ToFly); - init.Launch(); - + me->GetMotionMaster()->MoveCirclePath(QuelDelarCenterPos.GetPositionX(), QuelDelarCenterPos.GetPositionY(), 718.046f, 18.0f, true, 16); _events.ScheduleEvent(EVENT_QUEL_DELAR_LAND, 15000); break; } @@ -2694,21 +2688,6 @@ class npc_quel_delar_sword : public CreatureScript } private: - void FillCirclePath(Position const& centerPos, float radius, float z, Movement::PointsArray& path, bool clockwise) - { - float step = clockwise ? -M_PI / 8.0f : M_PI / 8.0f; - float angle = centerPos.GetAngle(me->GetPositionX(), me->GetPositionY()); - - for (uint8 i = 0; i < 16; angle += step, ++i) - { - G3D::Vector3 point; - point.x = centerPos.GetPositionX() + radius * cosf(angle); - point.y = centerPos.GetPositionY() + radius * sinf(angle); - point.z = z; - path.push_back(point); - } - } - EventMap _events; InstanceScript* _instance; bool _intro; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 43069f1046..6c3b218732 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -520,11 +520,7 @@ public: _despawned = false; break; case ACTION_CYCLIC_MOVEMENT: - Movement::MoveSplineInit init(me); - FillCirclePath(MalygosPositions[3], 120.0f, 283.2763f, init.Path(), true); - init.SetFly(); - init.SetCyclic(); - init.Launch(); + me->GetMotionMaster()->MoveCirclePath(MalygosPositions[3].GetPositionX(), MalygosPositions[3].GetPositionY(), 283.2763f, 120.0f, true, 16); break; } } @@ -1020,22 +1016,6 @@ public: } private: - // Used to generate perfect cyclic movements (Enter Circle). - void FillCirclePath(Position const& centerPos, float radius, float z, Movement::PointsArray& path, bool clockwise) - { - float step = clockwise ? float(-M_PI) / 8.0f : float(M_PI) / 8.0f; - float angle = centerPos.GetAngle(me->GetPositionX(), me->GetPositionY()); - - for (uint8 i = 0; i < 16; angle += step, ++i) - { - G3D::Vector3 point; - point.x = centerPos.GetPositionX() + radius * cosf(angle); - point.y = centerPos.GetPositionY() + radius * sinf(angle); - point.z = z; // Don't use any height getters unless all bugs are fixed. - path.push_back(point); - } - } - uint8 _phase; // Counter for phases used with a getter. uint8 _summonDeaths; // Keeps count of arcane trash. uint8 _preparingPulsesChecker; // In retail they use 2 preparing pulses with 7 sec CD, after they pass 2 seconds. @@ -1326,11 +1306,7 @@ public: { if (action < ACTION_DELAYED_DESPAWN) { - Movement::MoveSplineInit init(me); - FillCirclePath(MalygosPositions[3], 35.0f, 282.3402f, init.Path(), true); - init.SetFly(); - init.SetCyclic(); - init.Launch(); + me->GetMotionMaster()->MoveCirclePath(MalygosPositions[3].GetPositionX(), MalygosPositions[3].GetPositionY(), 282.3402f, 35.0f, true, 16); } else { @@ -1339,21 +1315,6 @@ public: } private: - void FillCirclePath(Position const& centerPos, float radius, float z, Movement::PointsArray& path, bool clockwise) - { - float step = clockwise ? float(-M_PI) / 9.0f : float(M_PI) / 9.0f; - float angle = centerPos.GetAngle(me->GetPositionX(), me->GetPositionY()); - - for (uint8 i = 0; i < 18; angle += step, ++i) - { - G3D::Vector3 point; - point.x = centerPos.GetPositionX() + radius * cosf(angle); - point.y = centerPos.GetPositionY() + radius * sinf(angle); - point.z = z; // Don't use any height getters unless all bugs are fixed. - path.push_back(point); - } - } - InstanceScript* _instance; }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index a682e405d0..a7a9f8dde8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -1126,30 +1126,11 @@ class npc_ominous_cloud : public CreatureScript DoCast(me, SPELL_OMINOUS_CLOUD_VISUAL); } - void FillCirclePath(Position const& centerPos, float radius, float z, Movement::PointsArray& path, bool clockwise) - { - float step = clockwise ? float(-M_PI) / 8.0f : float(M_PI) / 8.0f; - float angle = centerPos.GetAngle(me->GetPositionX(), me->GetPositionY()); - - for (uint8 i = 0; i < 16; angle += step, ++i) - { - G3D::Vector3 point; - point.x = centerPos.GetPositionX() + radius * cosf(angle); - point.y = centerPos.GetPositionY() + radius * sinf(angle); - point.z = me->GetMap()->GetHeight(me->GetPhaseMask(), point.x, point.y, z + 5.0f); - path.push_back(point); - } - } - void UpdateAI(uint32 /*diff*/) override { } void DoAction(int32 action) override { - Movement::MoveSplineInit init(me); - FillCirclePath(YoggSaronSpawnPos, me->GetDistance2d(YoggSaronSpawnPos.GetPositionX(), YoggSaronSpawnPos.GetPositionY()), me->GetPositionZ(), init.Path(), action != 0); - init.SetWalk(true); - init.SetCyclic(); - init.Launch(); + me->GetMotionMaster()->MoveCirclePath(YoggSaronSpawnPos.GetPositionX(), YoggSaronSpawnPos.GetPositionY(), me->GetPositionZ() + 5.0f, me->GetDistance2d(YoggSaronSpawnPos.GetPositionX(), YoggSaronSpawnPos.GetPositionY()), true, 16); } }; From a23ad2b33c7e31c6c8ff73244906dd7a3e4d124a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 7 Mar 2015 23:45:22 +0100 Subject: [PATCH 03/26] Core/Auras: Fixed possible crash in Aura::RefreshDuration - Aura::GetCaster can return NULL (cherry picked from commit 8cd1c9514f336da3d3d9436be554fc80edb6e761) Conflicts: src/server/game/Spells/Auras/SpellAuras.cpp --- src/server/game/Spells/Auras/SpellAuras.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 93a4c96b92..8449e37bd7 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -749,12 +749,13 @@ void Aura::SetDuration(int32 duration, bool withMods) void Aura::RefreshDuration(bool withMods) { - if (withMods) + Unit* caster = GetCaster(); + if (withMods && caster) { int32 duration = m_spellInfo->GetMaxDuration(); // Calculate duration of periodics affected by haste. - if (GetCaster()->HasAuraTypeWithAffectMask(SPELL_AURA_PERIODIC_HASTE, m_spellInfo) || m_spellInfo->AttributesEx5 & SPELL_ATTR5_HASTE_AFFECT_DURATION) - duration = int32(duration * GetCaster()->GetFloatValue(UNIT_MOD_CAST_SPEED)); + if (caster->HasAuraTypeWithAffectMask(SPELL_AURA_PERIODIC_HASTE, m_spellInfo) || m_spellInfo->AttributesEx5 & SPELL_ATTR5_HASTE_AFFECT_DURATION)) + duration = int32(duration * caster->GetFloatValue(UNIT_MOD_CAST_SPEED)); SetMaxDuration(duration); SetDuration(duration); From 170bc318b34d393ea08e1607b6a4de87fcb2e6d7 Mon Sep 17 00:00:00 2001 From: joschiwald Date: Fri, 6 Mar 2015 03:52:05 +0100 Subject: [PATCH 04/26] Core/Player: fixed some leftovers in db after player delete * character_arena_stats * character_battleground_random * character_cuf_profiles * character_currency * character_stats * character_void_storage (cherry picked from commit 2955a1f595be8ba510260e5a84b53663f2300fff) Conflicts: src/server/game/Entities/Player/Player.cpp src/server/shared/Database/Implementation/CharacterDatabase.cpp src/server/shared/Database/Implementation/CharacterDatabase.h --- src/server/game/Entities/Player/Player.cpp | 25 ++++++++++++++++--- src/server/game/World/World.cpp | 2 +- .../Implementation/CharacterDatabase.cpp | 5 +++- .../Implementation/CharacterDatabase.h | 3 +++ 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index de06b0ae5e..b0aa4775e1 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4830,10 +4830,26 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe stmt->setUInt32(0, guid); trans->Append(stmt); + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHARACTER_ARENA_STATS); + stmt->setUInt32(0, guid); + trans->Append(stmt); + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_AURA); stmt->setUInt32(0, guid); trans->Append(stmt); + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_BGDATA); + stmt->setUInt32(0, guid); + trans->Append(stmt); + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_BATTLEGROUND_RANDOM); + stmt->setUInt32(0, guid); + trans->Append(stmt); + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_CURRENCY); + stmt->setUInt32(0, guid); + trans->Append(stmt); + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_GIFT); stmt->setUInt32(0, guid); trans->Append(stmt); @@ -4923,10 +4939,6 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe stmt->setUInt32(0, guid); trans->Append(stmt); - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_BGDATA); - stmt->setUInt32(0, guid); - trans->Append(stmt); - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_GLYPHS); stmt->setUInt32(0, guid); trans->Append(stmt); @@ -4955,6 +4967,10 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe stmt->setUInt32(0, guid); trans->Append(stmt); + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_STATS); + stmt->setUInt32(0, guid); + trans->Append(stmt); + CharacterDatabase.CommitTransaction(trans); break; } @@ -19732,6 +19748,7 @@ void Player::_SaveInventory(SQLTransaction& trans) m_itemUpdateQueue.clear(); } + void Player::_SaveMail(SQLTransaction& trans) { if (!m_mailsLoaded) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 930bf20b6e..84f22f2f1a 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -3024,7 +3024,7 @@ void World::ResetRandomBG() { TC_LOG_INFO("misc", "Random BG status reset for all characters."); - PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_BATTLEGROUND_RANDOM); + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_BATTLEGROUND_RANDOM_ALL); CharacterDatabase.Execute(stmt); for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 265b057884..3a539cb6b3 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -60,7 +60,8 @@ void CharacterDatabaseConnection::DoPrepareStatements() PrepareStatement(CHAR_SEL_CHAR_POSITION_XYZ, "SELECT map, position_x, position_y, position_z FROM characters WHERE guid = ?", CONNECTION_SYNCH); PrepareStatement(CHAR_SEL_CHAR_POSITION, "SELECT position_x, position_y, position_z, orientation, map, taxi_path FROM characters WHERE guid = ?", CONNECTION_SYNCH); - PrepareStatement(CHAR_DEL_BATTLEGROUND_RANDOM, "DELETE FROM character_battleground_random", CONNECTION_ASYNC); + PrepareStatement(CHAR_DEL_BATTLEGROUND_RANDOM_ALL, "DELETE FROM character_battleground_random", CONNECTION_ASYNC); + PrepareStatement(CHAR_DEL_BATTLEGROUND_RANDOM, "DELETE FROM character_battleground_random WHERE guid = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_INS_BATTLEGROUND_RANDOM, "INSERT INTO character_battleground_random (guid) VALUES (?)", CONNECTION_ASYNC); PrepareStatement(CHAR_SEL_CHARACTER, "SELECT guid, account, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags, " @@ -248,6 +249,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() // Auras PrepareStatement(CHAR_INS_AURA, "INSERT INTO character_aura (guid, caster_guid, item_guid, spell, effect_mask, recalculate_mask, stackcount, amount0, amount1, amount2, base_amount0, base_amount1, base_amount2, maxduration, remaintime, remaincharges) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC); + PrepareStatement(CHAR_DEL_PLAYER_CURRENCY, "DELETE FROM character_currency WHERE CharacterGuid = ?", CONNECTION_ASYNC); // Account data PrepareStatement(CHAR_SEL_ACCOUNT_DATA, "SELECT type, time, data FROM account_data WHERE accountId = ?", CONNECTION_SYNCH); @@ -300,6 +302,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PrepareStatement(CHAR_DEL_ARENA_TEAM_MEMBER, "DELETE FROM arena_team_member WHERE arenaTeamId = ? AND guid = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_UPD_ARENA_TEAM_STATS, "UPDATE arena_team SET rating = ?, weekGames = ?, weekWins = ?, seasonGames = ?, seasonWins = ?, rank = ? WHERE arenaTeamId = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_UPD_ARENA_TEAM_MEMBER, "UPDATE arena_team_member SET personalRating = ?, weekGames = ?, weekWins = ?, seasonGames = ?, seasonWins = ? WHERE arenaTeamId = ? AND guid = ?", CONNECTION_ASYNC); + PrepareStatement(CHAR_DEL_CHARACTER_ARENA_STATS, "DELETE FROM character_arena_stats WHERE guid = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_REP_CHARACTER_ARENA_STATS, "REPLACE INTO character_arena_stats (guid, slot, matchMakerRating) VALUES (?, ?, ?)", CONNECTION_ASYNC); PrepareStatement(CHAR_SEL_PLAYER_ARENA_TEAMS, "SELECT arena_team_member.arenaTeamId FROM arena_team_member JOIN arena_team ON arena_team_member.arenaTeamId = arena_team.arenaTeamId WHERE guid = ?", CONNECTION_SYNCH); PrepareStatement(CHAR_UPD_ARENA_TEAM_NAME, "UPDATE arena_team SET name = ? WHERE arenaTeamId = ?", CONNECTION_ASYNC); diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h index f7ff5b9186..d2e35f92f3 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.h +++ b/src/server/shared/Database/Implementation/CharacterDatabase.h @@ -72,6 +72,7 @@ enum CharacterDatabaseStatements CHAR_SEL_CHAR_POSITION_XYZ, CHAR_SEL_CHAR_POSITION, + CHAR_DEL_BATTLEGROUND_RANDOM_ALL, CHAR_DEL_BATTLEGROUND_RANDOM, CHAR_INS_BATTLEGROUND_RANDOM, @@ -221,6 +222,7 @@ enum CharacterDatabaseStatements CHAR_DEL_EQUIP_SET, CHAR_INS_AURA, + CHAR_DEL_PLAYER_CURRENCY, CHAR_SEL_ACCOUNT_DATA, CHAR_REP_ACCOUNT_DATA, @@ -253,6 +255,7 @@ enum CharacterDatabaseStatements CHAR_DEL_ARENA_TEAM_MEMBER, CHAR_UPD_ARENA_TEAM_STATS, CHAR_UPD_ARENA_TEAM_MEMBER, + CHAR_DEL_CHARACTER_ARENA_STATS, CHAR_REP_CHARACTER_ARENA_STATS, CHAR_SEL_PLAYER_ARENA_TEAMS, CHAR_UPD_ARENA_TEAM_NAME, From fb55b9bb85381923d5ccbd71ddf78c9f40d14726 Mon Sep 17 00:00:00 2001 From: Guillaume Belz Date: Tue, 27 Jan 2015 21:53:54 +0100 Subject: [PATCH 05/26] FindOpenSSL: fix detection of OpenSSL 1.0.2 Closes #14284 (cherry picked from commit 9ffeb58d094ddba9bffb33a79b33ade9af9f5c00) --- cmake/macros/FindOpenSSL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake index 1cc34b36a4..7baa43274a 100644 --- a/cmake/macros/FindOpenSSL.cmake +++ b/cmake/macros/FindOpenSSL.cmake @@ -186,7 +186,7 @@ if (OPENSSL_INCLUDE_DIR) set(OPENSSL_VERSION "${_OPENSSL_VERSION}") else (_OPENSSL_VERSION) file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str - REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9][0-9][0-9][0-9].*") + REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9][0-9][0-9][0-9].*") # The version number is encoded as 0xMNNFFPPS: major minor fix patch status # The status gives if this is a developer or prerelease and is ignored here. From dbcfa3b12024da53fe6ead97cd1dae92c79f3565 Mon Sep 17 00:00:00 2001 From: Nayd Date: Sun, 15 Mar 2015 14:09:00 +0000 Subject: [PATCH 06/26] SpellAuras.cpp: typo fix --- src/server/game/Spells/Auras/SpellAuras.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 8449e37bd7..4af0b93789 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -754,7 +754,7 @@ void Aura::RefreshDuration(bool withMods) { int32 duration = m_spellInfo->GetMaxDuration(); // Calculate duration of periodics affected by haste. - if (caster->HasAuraTypeWithAffectMask(SPELL_AURA_PERIODIC_HASTE, m_spellInfo) || m_spellInfo->AttributesEx5 & SPELL_ATTR5_HASTE_AFFECT_DURATION)) + if (caster->HasAuraTypeWithAffectMask(SPELL_AURA_PERIODIC_HASTE, m_spellInfo) || m_spellInfo->AttributesEx5 & SPELL_ATTR5_HASTE_AFFECT_DURATION) duration = int32(duration * caster->GetFloatValue(UNIT_MOD_CAST_SPEED)); SetMaxDuration(duration); From 03104087fa87ffff3340f9e2ce5939231aea417b Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 15 Mar 2015 14:28:28 +0000 Subject: [PATCH 07/26] DB/Quest: The Delicate Sound of Thunder / Lightning Infused Relics By @Killyana Closes #14269 --- sql/updates/world/2015_03_15_00_world.sql | 316 ++++++++++++++++++++++ 1 file changed, 316 insertions(+) create mode 100644 sql/updates/world/2015_03_15_00_world.sql diff --git a/sql/updates/world/2015_03_15_00_world.sql b/sql/updates/world/2015_03_15_00_world.sql new file mode 100644 index 0000000000..659d167e55 --- /dev/null +++ b/sql/updates/world/2015_03_15_00_world.sql @@ -0,0 +1,316 @@ +SET @GUID:=14830; -- 6 free GO guid required (spell focus) +SET @SUMMON := 49991; +SET @GOLEM := 24825; +SET @BENCH := 186958; +SET @Relic := 24824; +SET @Triggger :=24845; +SET @IronDwarf :=24846; +SET @LOKEN := 24847; +SET @Ouvrier:= 23672; +SET @Maitre:=23675; +SET @Garde:=23673; +SET @IRONGolem:=24271; +SET @Earth:=24340; +SET @A1A2:=24826; +SET @B1B2:=24827; +SET @C1C2:=24828; +SET @D1:=24831; +SET @D2:=24829; +SET @D3:=24832; + +DELETE FROM `spell_target_position` WHERE `id` in (49992); +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(49992, 571, 478.951782, -5941.529297, 308.749969, 0.419872); + +UPDATE `creature_template` SET `spell1`=44608, `spell2`=44610, `spell3`=44609,`AIName`='SmartAI', `InhabitType`=5 WHERE `entry`=@GOLEM; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@LOKEN, @IronDwarf, @Triggger, @Relic, @Ouvrier, @Maitre, @Garde, @IRONGolem, @Earth, @A1A2, @B1B2, @C1C2, @D1, @D2, @D3); +UPDATE `creature_template` SET `faction`= 1954 WHERE `entry`=@LOKEN; +UPDATE `creature_template` SET `flags_extra`= 0 WHERE `entry`=@Triggger; + +DELETE FROM `creature` WHERE `id` IN (24846, 24847); +DELETE FROM `creature_addon` WHERE `guid` =97731; +UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `id`= @Triggger; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@GOLEM AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Relic AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@BENCH AND `source_type`=1 AND `id` IN (6,7); +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Triggger AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Triggger*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@IronDwarf AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@IronDwarf*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@LOKEN AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@LOKEN*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Garde AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Garde*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Garde*100+1 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Ouvrier AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Ouvrier*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Ouvrier*100+1 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Earth AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Maitre AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Maitre*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Maitre*100+1 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@IRONGolem AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@IRONGolem*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@IRONGolem*100+1 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@A1A2*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@B1B2*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@C1C2*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@D1*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@D2*100 AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@D3*100 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@BENCH,1,6,7,62,0,100,0,9024,3,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Work Bench - Gossip select - Close gossip'), +(@BENCH,1,7,0,61,0,100,0,0,0,0,0,85,@SUMMON,2,0,0,0,0,7,0,0,0,0,0,0,0,'Work Bench - Gossip select - Summon Iron Rune Construct'), +(@GOLEM,0,0,0,54,0,100,0,0,0,0,0,75,44643,0,0,0,0,0,23,0,0,0,0,0,0,0,'Iron Rune Construct - Just Summoned - Add aura to owner'), +(@GOLEM,0,1,0,28,0,100,0,0,0,0,0,28,44643,0,0,0,0,0,23,0,0,0,0,0,0,0,'Iron Rune Construct - Passenger removed - remove aura from owner'), +(@Relic,0,0,0,8,0,100,0,44610,0,0,0,41,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Relict - SpellHit - Despawn'), +(@Triggger,0,0,0,10,0,100,0,1,20,180000,180000,80,@Triggger*100,2,0,0,0,0,1,0,0,0,0,0,0,0,'Triggger - LOS - Action list'), +(@Triggger*100,9,0,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,306.098907, -5706.150391, 102.435051, 4.96977,'Triggger - Action list - Summon'), +(@Triggger*100,9,1,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,311.025482, -5702.801270, 101.934959, 5.187225,'Triggger - Action list - Summon'), +(@Triggger*100,9,2,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,309.754456, -5703.156250, 102.070854, 5.187225,'Triggger - Action list - Summon'), +(@Triggger*100,9,3,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,308.222504, -5703.797363, 102.231758, 5.187225,'Triggger - Action list - Summon'), +(@Triggger*100,9,4,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,307.043610, -5704.315430, 102.356087, 5.187225,'Triggger - Action list - Summon'), +(@Triggger*100,9,5,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,304.169464, -5706.838379, 102.696602, 5.187225,'Triggger - Action list - Summon'), +(@Triggger*100,9,6,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,303.129547, -5707.277344, 102.978165, 5.187225,'Triggger - Action list - Summon'), +(@Triggger*100,9,7,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,297.246,-5726.82,96.2681,0.347607,'Triggger - Action list - Summon'), +(@Triggger*100,9,8,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,292.82,-5726.04,96.5843,0.347607,'Triggger - Action list - Summon'), +(@Triggger*100,9,9,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,292.562,-5728.57,96.5857,0.347607,'Triggger - Action list - Summon'), +(@Triggger*100,9,10,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,292.15,-5727.42,96.5874,0.347607,'Triggger - Action list - Summon'), +(@Triggger*100,9,11,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,294.578,-5730.09,96.2958,0.347607,'Triggger - Action list - Summon'), +(@Triggger*100,9,12,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,296.196,-5730.17,96.0082,0.347607,'Triggger - Action list - Summon'), +(@Triggger*100,9,13,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,297.603,-5730.79,95.6955,0.347607,'Triggger - Action list - Summon'), +(@Triggger*100,9,14,0,0,0,100,0,0,0,0,0,12,@IronDwarf,5,0,0,0,0,8,0,0,0,299.397,-5729.56,95.7274,0.347607,'Triggger - Action list - Summon'), +(@Triggger*100,9,15,0,0,0,100,0,0,0,0,0,12,@LOKEN,5,0,0,0,0,8,0,0,0,315.101,-5723.06,96.2541,3.05433,'Triggger - Action list - Summon'), +(@Triggger*100,9,16,0,0,0,100,0,70000,70000,0,0,41,0,0,0,0,0,0,11,@IronDwarf,40,0,0,0,0,0,'Triggger - Action List - Despawn'), +(@Triggger,0,1,0,25,0,100,0,0,0,0,0,47,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Triggger - On reset - set Invisible'), +(@IronDwarf,0,0,0,54,0,100,0,0,0,0,0,80,@IronDwarf*100,2,0,0,0,0,1,0,0,0,0,0,0,0,'IronDwarf - Just Summoned - Action List'), +(@IronDwarf*100,9,0,0,0,0,100,0,0,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'IronDwarf - Action List - Set run off'), +(@IronDwarf*100,9,1,0,0,0,100,0,0,0,0,0,46,8,0,0,0,0,0,1,0,0,0,0,0,0,0,'IronDwarf - Action List - Move forward'), +(@IronDwarf*100,9,2,0,0,0,100,0,4000,4000,0,0,11,68442,0,0,0,0,0,1,0,0,0,0,0,0,0,'IronDwarf - Action List - Cast Kneels'), +(@LOKEN,0,0,0,54,0,100,0,0,0,0,0,80,@LOKEN*100,2,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - Just Summoned - Action List'), +(@LOKEN*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - Action List - Talk'), +(@LOKEN*100,9,1,0,0,0,100,0,6000,6000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - Action List - Talk'), +(@LOKEN*100,9,2,0,0,0,100,0,6000,6000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - Action List - Talk'), +(@LOKEN*100,9,3,0,0,0,100,0,8000,8000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - Action List - Talk'), +(@LOKEN*100,9,4,0,0,0,100,0,9000,9000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - Action List - Talk'), +(@LOKEN*100,9,5,0,0,0,100,0,9000,9000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - Action List - Talk'), +(@LOKEN*100,9,6,0,0,0,100,0,7000,7000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - Action List - Talk'), +(@LOKEN*100,9,7,0,0,0,100,0,0,0,0,0,11,44682,0,0,0,0,0,21,30,0,0,0,0,0,0,'LOKEN - Action List - Cast Credit'), +(@LOKEN*100,9,8,0,0,0,100,0,2000,2000,0,0,41,0,0,0,0,0,0,11,@IronDwarf,40,0,0,0,0,0,'LOKEN - Action List - Despawn Dwarfs'), +(@LOKEN*100,9,9,0,0,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - Action List - Despawn'), +(@IronDwarf,0,1,0,4,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'IronDwarf - On aggro - despawn'), +(@LOKEN,0,1,0,4,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'LOKEN - On aggro - despawn'), +(@Garde,0,0,0,10,0,20,0,1,9,60000,60000,80,@Garde*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Garde - LOS - Action list'), +(@Garde*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Garde - Action list - TALK'), +(@Garde*100,9,1,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Garde - Action list - Set Event phase1'), +(@Garde*100,9,2,0,0,0,100,0,0,0,0,0,103,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Garde - Action list - Root'), +(@Garde*100,9,3,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,19,@GOLEM,20,0,0,0,0,0,'Garde - Action list - Set Orientation'), +(@Garde*100,9,4,0,0,0,100,0,10000,10000,0,0,103,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Garde - Action list - remove root'), +(@Garde*100,9,5,0,0,1,100,0,0,0,0,0,28,44643,0,0,0,0,0,21,50,0,0,0,0,0,0,'Garde - Action list - remove Aura'), +(@Garde*100,9,6,0,0,1,100,0,0,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,'Garde - Action list - Talk'), +(@Garde,0,1,0,8,1,100,0,44609,0,0,0,80,@Garde*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Garde - spell hit - action list'), +(@Garde*100+1,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Garde - Action list - Set Event phase 0'), +(@Garde*100+1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,@GOLEM,20,0,0,0,0,0,'Garde - Action list - TALK'), +(@Garde*100+1,9,2,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Garde - Action list - TALK'), +(@Garde,0,2,0,0,0,100,0,5000,5000,30000,30000,11,42580,0,0,0,0,0,2,0,0,0,0,0,0,0,'Garde - IC - Cast'), +(@Garde,0,3,0,4,0,100,0,0,0,0,0,11,49758,0,0,0,0,0,2,0,0,0,0,0,0,0,'Garde - On aggro - Cast'), +(@Ouvrier,0,0,0,10,0,20,0,1,9,60000,60000,80,@Ouvrier*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ouvrier - LOS - Action list'), +(@Ouvrier*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ouvrier - Action list - TALK'), +(@Ouvrier*100,9,1,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ouvrier - Action list - Set Event phase1'), +(@Ouvrier*100,9,2,0,0,0,100,0,0,0,0,0,103,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ouvrier - Action list - Root'), +(@Ouvrier*100,9,3,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,19,@GOLEM,20,0,0,0,0,0,'Ouvrier - Action list - Set Orientation'), +(@Ouvrier*100,9,4,0,0,0,100,0,10000,10000,0,0,103,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ouvrier - Action list - remove root'), +(@Ouvrier*100,9,5,0,0,1,100,0,0,0,0,0,28,44643,0,0,0,0,0,21,50,0,0,0,0,0,0,'Ouvrier - Action list - remove Aura'), +(@Ouvrier*100,9,6,0,0,1,100,0,0,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,'Ouvrier - Action list - Talk'), +(@Ouvrier,0,1,0,8,1,100,0,44609,0,0,0,80,@Ouvrier*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ouvrier - spell hit - action list'), +(@Ouvrier*100+1,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ouvrier - Action list - Set Event phase 0'), +(@Ouvrier*100+1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,@GOLEM,20,0,0,0,0,0,'Ouvrier - Action list - TALK'), +(@Ouvrier*100+1,9,2,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ouvrier - Action list - TALK'), +(@Ouvrier,0,2,0,0,0,100,0,5000,5000,5000,8000,11,49749,0,0,0,0,0,2,0,0,0,0,0,0,0,'Ouvrier - IC - Cast'), +(@Maitre,0,0,0,10,0,20,0,1,9,60000,60000,80,@Maitre*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maitre - LOS - Action list'), +(@Maitre*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maitre - Action list - TALK'), +(@Maitre*100,9,1,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maitre - Action list - Set Event phase1'), +(@Maitre*100,9,2,0,0,0,100,0,0,0,0,0,103,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maitre - Action list - Root'), +(@Maitre*100,9,3,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,19,@GOLEM,20,0,0,0,0,0,'Maitre - Action list - Set Orientation'), +(@Maitre*100,9,4,0,0,0,100,0,10000,10000,0,0,103,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maitre - Action list - remove root'), +(@Maitre*100,9,5,0,0,1,100,0,0,0,0,0,28,44643,0,0,0,0,0,21,50,0,0,0,0,0,0,'Maitre - Action list - remove Aura'), +(@Maitre*100,9,6,0,0,1,100,0,0,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,'Maitre - Action list - Talk'), +(@Maitre,0,1,0,8,1,100,0,44609,0,0,0,80,@Maitre*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maitre - spell hit - action list'), +(@Maitre*100+1,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maitre - Action list - Set Event phase 0'), +(@Maitre*100+1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,@GOLEM,20,0,0,0,0,0,'Maitre - Action list - TALK'), +(@Maitre*100+1,9,2,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maitre - Action list - TALK'), +(@Maitre,0,2,0,0,0,100,0,5000,5000,7000,10000,11,49753,0,0,0,0,0,2,0,0,0,0,0,0,0,'Garde - IC - Cast'), +(@IRONGolem,0,0,0,10,0,20,0,1,9,60000,60000,80,@IRONGolem*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'IRONGolem - LOS - Action list'), +(@IRONGolem*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'IRONGolem - Action list - TALK'), +(@IRONGolem*100,9,1,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'IRONGolem - Action list - Set Event phase1'), +(@IRONGolem*100,9,2,0,0,0,100,0,0,0,0,0,103,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'IRONGolem - Action list - Root'), +(@IRONGolem*100,9,3,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,19,@GOLEM,20,0,0,0,0,0,'IRONGolem - Action list - Set Orientation'), +(@IRONGolem*100,9,4,0,0,0,100,0,10000,10000,0,0,103,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'IRONGolem - Action list - remove root'), +(@IRONGolem*100,9,5,0,0,1,100,0,0,0,0,0,28,44643,0,0,0,0,0,21,50,0,0,0,0,0,0,'IRONGolem - Action list - remove Aura'), +(@IRONGolem*100,9,6,0,0,1,100,0,0,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,'IRONGolem - Action list - talk'), +(@IRONGolem,0,1,0,8,1,100,0,44609,0,0,0,80,@IRONGolem*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'IRONGolem - spell hit - action list'), +(@IRONGolem*100+1,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'IRONGolem - Action list - Set Event phase 0'), +(@IRONGolem*100+1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,@GOLEM,20,0,0,0,0,0,'IRONGolem - Action list - TALK'), +(@IRONGolem*100+1,9,2,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'IRONGolem - Action list - TALK'), +(@IRONGolem,0,2,0,0,0,100,0,5000,5000,7000,10000,11,49729,0,0,0,0,0,2,0,0,0,0,0,0,0,'IRONGolem - IC - Cast'), +(@IRONGolem,0,3,0,1,0,100,0,50000,60000,60000,90000,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'IRONGolem - ooc - talk'), +(@Earth,0,0,0,0,0,100,0,2000,5000,6000,8000,11,49742,0,0,0,0,0,2,0,0,0,0,0,0,0,'IRONGolem - IC - Cast'), +(@GOLEM,0,2,0,8,0,100,0,44626,0,5000,5000,80,@A1A2*100,0,0,0,0,0,19,@A1A2,1,0,0,0,0,0,'Iron Rune Construct - On spellhit - Action List'), +(@A1A2*100,9,0,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,14,57776,186953,0,0,0,0,0,'A1A2 - Action list - Activate Gobject'), +(@A1A2*100,9,1,0,0,0,100,0,0,0,0,0,45,0,1,0,0,0,0,19,@GOLEM,10,0,0,0,0,0,'A1A2 - Action list - SetData'), +(@GOLEM,0,3,0,8,0,100,0,44626,0,5000,5000,80,@B1B2*100,0,0,0,0,0,19,@B1B2,1,0,0,0,0,0,'Iron Rune Construct - On spellhit - Action List'), +(@B1B2*100,9,0,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,14,57915,186960,0,0,0,0,0,'B1B2 - Action list - Activate Gobject'), +(@B1B2*100,9,1,0,0,0,100,0,0,0,0,0,45,0,2,0,0,0,0,19,@GOLEM,10,0,0,0,0,0,'B1B2 - Action list - SetData'), +(@GOLEM,0,4,0,8,0,100,0,44626,0,5000,5000,80,@C1C2*100,0,0,0,0,0,19,@C1C2,1,0,0,0,0,0,'Iron Rune Construct - On spellhit - Action List'), +(@C1C2*100,9,0,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,14,57963,186961,0,0,0,0,0,'C1C2 - Action list - Activate Gobject'), +(@C1C2*100,9,1,0,0,0,100,0,0,0,0,0,45,0,3,0,0,0,0,19,@GOLEM,10,0,0,0,0,0,'C1C2 - Action list - SetData'), +(@GOLEM,0,5,0,8,0,100,0,44626,0,5000,5000,80,@D1*100,0,0,0,0,0,19,@D1,1,0,0,0,0,0,'Iron Rune Construct - On spellhit - Action List'), +(@D1*100,9,0,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,14,57972,186962,0,0,0,0,0,'D1 - Action list - Activate Gobject'), +(@D1*100,9,1,0,0,0,100,0,0,0,0,0,45,0,4,0,0,0,0,19,@GOLEM,10,0,0,0,0,0,'D1 - Action list - SetData'), +(@GOLEM,0,6,0,8,0,100,0,44626,0,5000,5000,80,@D2*100,0,0,0,0,0,19,@D2,1,0,0,0,0,0,'Iron Rune Construct - On spellhit - Action List'), +(@D2*100,9,0,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,14,57988,186963,0,0,0,0,0,'D2 - Action list - Activate Gobject'), +(@D2*100,9,1,0,0,0,100,0,0,0,0,0,45,0,5,0,0,0,0,19,@GOLEM,10,0,0,0,0,0,'D2 - Action list - SetData'), +(@GOLEM,0,7,0,8,0,100,0,44626,0,5000,5000,80,@D3*100,0,0,0,0,0,19,@D3,1,0,0,0,0,0,'Iron Rune Construct - On spellhit - Action List'), +(@D3*100,9,0,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,14,66097,186964,0,0,0,0,0,'D3 - Action list - Activate Gobject'), +(@D3*100,9,1,0,0,0,100,0,0,0,0,0,45,0,6,0,0,0,0,19,@GOLEM,10,0,0,0,0,0,'D3 - Action list - SetData'), +(@GOLEM,0,8,0,38,0,100,0,0,1,0,0,53,1,@A1A2,0,0,0,0,1,0,0,0,0,0,0,0,'Iron Rune Construct - On data set - Start waypoint'), +(@GOLEM,0,9,0,38,0,100,0,0,2,0,0,53,1,@B1B2,0,0,0,0,1,0,0,0,0,0,0,0,'Iron Rune Construct - On data set - Start waypoint'), +(@GOLEM,0,10,0,38,0,100,0,0,3,0,0,53,1,@C1C2,0,0,0,0,1,0,0,0,0,0,0,0,'Iron Rune Construct - On data set - Start waypoint'), +(@GOLEM,0,11,0,38,0,100,0,0,4,0,0,53,1,@D1,0,0,0,0,1,0,0,0,0,0,0,0,'Iron Rune Construct - On data set - Start waypoint'), +(@GOLEM,0,12,0,38,0,100,0,0,5,0,0,53,1,@D2,0,0,0,0,1,0,0,0,0,0,0,0,'Iron Rune Construct - On data set - Start waypoint'), +(@GOLEM,0,13,0,38,0,100,0,0,6,0,0,53,1,@D3,0,0,0,0,1,0,0,0,0,0,0,0,'Iron Rune Construct - On data set - Start waypoint'), +(@GOLEM,0,14,0,58,0,100,0,0,0,0,0,28,44626,0,0,0,0,0,1,0,0,0,0,0,0,0,'Iron Rune Construct - On waypoint end - Remove aura'); + +DELETE FROM `waypoints` WHERE `entry` IN (@C1C2, @B1B2, @A1A2, @D1, @D2, @D3); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@C1C2,1, 250.667023, -5770.241699, 252.249847,'Iron Rune Construct'), +(@C1C2,2, 158.802368, -5823.064941, 7.080285,'Iron Rune Construct'), +(@B1B2,1, 268.167053, -5814.819824, 282.507080,'Iron Rune Construct'), +(@B1B2,2, 255.435913, -5891.186035, 83.068146,'Iron Rune Construct'), +(@A1A2,1, 221.699432, -5736.851074, 289.626099,'Iron Rune Construct'), +(@A1A2,2, 157.139877, -5712.004883, 189.551346,'Iron Rune Construct'), +(@D1,1, 212.711884, -5808.783691, 297.261902,'Iron Rune Construct'), +(@D1,2, 276.179016, -5755.332031, 268.456543,'Iron Rune Construct'), +(@D2,1, 228.848938, -5740.563477, 283.448700,'Iron Rune Construct'), +(@D2,2, 278.266785, -5758.165039, 268.454834,'Iron Rune Construct'), +(@D3,1, 266.918884, -5837.802246, 304.154144,'Iron Rune Construct'), +(@D3,2, 280.913208, -5761.616699, 268.456696,'Iron Rune Construct'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=@Triggger; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`, `ErrorTextId`,`ScriptName`,`Comment`) VALUES +(22,1,@Triggger,0,31,3,24825,0,0,'','event require npc 24825'); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=@IRONGolem; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`, `ErrorTextId`,`ScriptName`,`Comment`) VALUES +(22,1,@IRONGolem,0,31,3,24825,0,0,'','event require npc 24825'); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=@Garde; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`, `ErrorTextId`,`ScriptName`,`Comment`) VALUES +(22,1,@Garde,0,31,3,24825,0,0,'','event require npc 24825'); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=@Maitre; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`, `ErrorTextId`,`ScriptName`,`Comment`) VALUES +(22,1,@Maitre,0,31,3,24825,0,0,'','event require npc 24825'); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=@Ouvrier; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`, `ErrorTextId`,`ScriptName`,`Comment`) VALUES +(22,1,@Ouvrier,0,31,3,24825,0,0,'','event require npc 24825'); + +DELETE FROM `creature_text` WHERE `entry`IN (@LOKEN, @GOLEM, @Garde, @Ouvrier, @Maitre, @IRONGolem); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`, `BroadcastTextID`) VALUES +(@LOKEN,0,0,"The sound of thunder roars throughout the cavern.",41,9,100,0,0,0,'LOKEN', 23927), +(@LOKEN,1,0,"Come, minions! Your master calls!",14,9,100,0,0,0,'LOKEN', 23922), +(@LOKEN,2,0,"The work of your brothers in the Storm Peaks has reached a frenzied pace. Soon, Father will be freed.",14,9,100,0,0,0,'LOKEN', 23923), +(@LOKEN,3,0,"Your brothers to the north have subjugated the stone behemoths and set them on the path to Ulduar. Soon, the remaining defenses of the Pantheon will be neutralized.",14,9,100,0,0,0,'LOKEN', 23924), +(@LOKEN,4,0,"The three fissures opened by the mortals of this region must be silenced. The earth hears and sees what we do and will continue to interfere with our efforts if the way is not closed.",14,9,100,0,0,0,'LOKEN', 23925), +(@LOKEN,5,0,"Bury this place! Your master demands it!",14,9,100,0,0,0,'LOKEN', 23926), +(@LOKEN,6,0,"The sound of thunder dissipates.",41,9,100,0,0,0,'LOKEN', 23928), +(@GOLEM,0,0,"Alert! Alert! Construct senses that enemies have breeched our defenses. Increase pace.",12,9,100,0,0,0,'GOLEM', 23895), +(@GOLEM,0,1,"Construct class carrier reporting for duty. Primary function: Overseeing.",12,9,100,0,0,0,'GOLEM', 23896), +(@GOLEM,0,2,"There is nothing to see here. Proceed with your mandated duties.",12,9,100,0,0,0,'GOLEM', 23897), +(@GOLEM,0,3,"To interfere with construct's function results in termination. Move along.",12,9,100,0,0,0,'GOLEM', 23899), +(@GOLEM,0,4,"Construct must not be questioned by iron dwarf servant. Commence deconstruction.",12,9,100,0,0,0,'GOLEM', 23900), +(@GOLEM,0,5,"Construct is not authorized to communicate with lesser beings. Being must double their efforts.",12,9,100,0,0,0,'GOLEM', 23901), +(@GOLEM,0,6,"Did you lose your wallet? Construct has found wallet with overabundance of currency.",12,9,100,0,0,0,'GOLEM', 23902), +(@Garde,0,0,"Halt! Identify yourself immediately!",12,9,100,0,0,0,'Garde', 23903), +(@Garde,0,1,"This section is off-limits!",12,9,100,0,0,0,'Garde', 23904), +(@Garde,0,2,"I've never seen one of you around here.",12,9,100,0,0,0,'Garde', 23905), +(@Garde,0,3,"Hold it! Stop!",12,9,100,0,0,0,'Garde', 23906), +(@Garde,0,4,"Stop!! Stop!!! Scrap metal moves itself now?",12,9,100,0,0,0,'Garde', 23907), +(@Garde,1,2,"Right... my bad. Now where was I?",12,9,100,0,0,0,'Garde', 23910), +(@Garde,1,3,"All hail the great creator!",12,9,100,0,0,0,'Garde', 23911), +(@Garde,1,4,"You're right, of course. Carry on.",12,9,100,0,0,0,'Garde', 23912), +(@Garde,1,5,"Forgive my insolence!",12,9,100,0,0,0,'Garde', 23913), +(@Garde,1,6,"We will double our efforts!",12,9,100,0,0,0,'Garde', 23915), +(@Garde,2,0,"Destroy earthen infestation.",12,9,100,0,0,0,'Garde', 23921), +(@Garde,2,1,"Wrong answer!",12,9,100,0,0,0,'Garde', 23908), +(@Ouvrier,0,0,"Halt! Identify yourself immediately!",12,9,100,0,0,0,'Garde', 23903), +(@Ouvrier,0,1,"This section is off-limits!",12,9,100,0,0,0,'Garde', 23904), +(@Ouvrier,0,2,"I've never seen one of you around here.",12,9,100,0,0,0,'Garde', 23905), +(@Ouvrier,0,3,"Hold it! Stop!",12,9,100,0,0,0,'Garde', 23906), +(@Ouvrier,0,4,"Stop!! Stop!!! Scrap metal moves itself now?",12,9,100,0,0,0,'Garde', 23907), +(@Ouvrier,1,2,"Right... my bad. Now where was I?",12,9,100,0,0,0,'Garde', 23910), +(@Ouvrier,1,3,"All hail the great creator!",12,9,100,0,0,0,'Garde', 23911), +(@Ouvrier,1,4,"You're right, of course. Carry on.",12,9,100,0,0,0,'Garde', 23912), +(@Ouvrier,1,5,"Forgive my insolence!",12,9,100,0,0,0,'Garde', 23913), +(@Ouvrier,1,6,"We will double our efforts!",12,9,100,0,0,0,'Garde', 23915), +(@Ouvrier,2,0,"Destroy earthen infestation.",12,9,100,0,0,0,'Garde', 23921), +(@Ouvrier,2,1,"Wrong answer!",12,9,100,0,0,0,'Garde', 23908), +(@Maitre,0,0,"Halt! Identify yourself immediately!",12,9,100,0,0,0,'Garde', 23903), +(@Maitre,0,1,"This section is off-limits!",12,9,100,0,0,0,'Garde', 23904), +(@Maitre,0,2,"I've never seen one of you around here.",12,9,100,0,0,0,'Garde', 23905), +(@Maitre,0,3,"Hold it! Stop!",12,9,100,0,0,0,'Garde', 23906), +(@Maitre,0,4,"Stop!! Stop!!! Scrap metal moves itself now?",12,9,100,0,0,0,'Garde', 23907), +(@Maitre,1,2,"Right... my bad. Now where was I?",12,9,100,0,0,0,'Garde', 23910), +(@Maitre,1,3,"All hail the great creator!",12,9,100,0,0,0,'Garde', 23911), +(@Maitre,1,4,"You're right, of course. Carry on.",12,9,100,0,0,0,'Garde', 23912), +(@Maitre,1,5,"Forgive my insolence!",12,9,100,0,0,0,'Garde', 23913), +(@Maitre,1,6,"We will double our efforts!",12,9,100,0,0,0,'Garde', 23915), +(@Maitre,2,0,"Destroy earthen infestation.",12,9,100,0,0,0,'Garde', 23921), +(@Maitre,2,1,"Wrong answer!",12,9,100,0,0,0,'Garde', 23908), +(@IRONGolem,0,0,"Halt! Identify yourself immediately!",12,9,100,0,0,0,'Garde', 23903), +(@IRONGolem,0,1,"This section is off-limits!",12,9,100,0,0,0,'Garde', 23904), +(@IRONGolem,0,2,"I've never seen one of you around here.",12,9,100,0,0,0,'Garde', 23905), +(@IRONGolem,0,3,"Hold it! Stop!",12,9,100,0,0,0,'Garde', 23906), +(@IRONGolem,0,4,"Stop!! Stop!!! Scrap metal moves itself now?",12,9,100,0,0,0,'Garde', 23907), +(@IRONGolem,1,2,"Right... my bad. Now where was I?",12,9,100,0,0,0,'Garde', 23910), +(@IRONGolem,1,3,"All hail the great creator!",12,9,100,0,0,0,'Garde', 23911), +(@IRONGolem,1,4,"You're right, of course. Carry on.",12,9,100,0,0,0,'Garde', 23912), +(@IRONGolem,1,5,"Forgive my insolence!",12,9,100,0,0,0,'Garde', 23913), +(@IRONGolem,1,6,"We will double our efforts!",12,9,100,0,0,0,'Garde', 23915), +(@IRONGolem,2,0,"Destroy earthen infestation.",12,9,100,0,0,0,'Garde', 23921), +(@IRONGolem,2,1,"Wrong answer!",12,9,100,0,0,0,'Garde', 23908), +(@IRONGolem,3,0,"Continue deconstruction.",12,9,100,0,0,0,'Garde', 23919), +(@IRONGolem,3,1,"Do not loiter.",12,9,100,0,0,0,'Garde', 23918), +(@IRONGolem,3,2,"Work must continue. Double your efforts.",12,9,100,0,0,0,'Garde', 23916), +(@IRONGolem,3,3,"Brontes sees all.",12,9,100,0,0,0,'Garde', 23917), +(@IRONGolem,3,4,"Reinforcements en route. Function must be unabated.",12,9,100,0,0,0,'Garde', 23920), +(@IRONGolem,3,5,"Do you bring word from the creator?",12,9,100,0,0,0,'Garde', 23914), +(@IRONGolem,3,6,"All hail the great creator.",12,9,100,0,0,0,'Garde', 23898); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=44609; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 44609, 0, 31, 3, 24271, 0, 0, '', 'Bluff target'), +(13, 1, 44609, 1, 31, 3, 23673, 0, 0, '', 'Bluff target'), +(13, 1, 44609, 2, 31, 3, 23672, 0, 0, '', 'Bluff target'), +(13, 1, 44609, 3, 31, 3, 23675, 0, 0, '', 'Bluff target'); + +SET @ID := 9024; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@ID AND `SourceEntry`=3; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,@ID,3,0,9,11495,0,0,0,'','Show gossip option if player has quest The Delicate Sound of Thunder'), +(15,@ID,3,1,9,11494,0,0,0,'','Show gossip option if player has quest Lightning Infused Relics'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=44610; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 44610, 0, 31, 3, 24824, 0, 0, '', 'Collect Data target'); + +DELETE FROM `gameobject` WHERE `guid` in (@GUID+0, @GUID+1, @GUID+2, @GUID+3, @GUID+4, @GUID+5); +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID+0,186959,571,1,1,276.169006, -5755.250000, 268.455994,0,0,0,0,1,120,255,1), +(@GUID+1,186959,571,1,1,278.528992, -5758.350098, 268.455994,0,0,0,0,1,120,255,1), +(@GUID+2,186959,571,1,1,280.851990, -5761.399902, 268.455994,0,0,0,0,1,120,255,1), +(@GUID+3,186959,571,1,1,158.707001, -5823.319824, 7.006820,0,0,0,0,1,120,255,1), +(@GUID+4,186959,571,1,1,157.201996, -5712.160156, 189.315002,0,0,0,0,1,120,255,1), +(@GUID+5,186959,571,1,1,255.533997, -5891.359863, 82.992897,0,0,0,0,1,120,255,1); + +UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `id` IN (24828, 24829, 24831, 24832, 24826, 24827); + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 44608; +INSERT INTO `spell_linked_spell` VALUES (44608, 44626, 0, 'Rocket Jump'); From e27fcb91c345e10462225384ff4027ea66dd89ad Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 15:47:31 +0100 Subject: [PATCH 08/26] DB/SQL: Rename SQL to 2015_03_15_01_world.sql --- .../world/{2015_01_31_01_world.sql => 2015_03_15_01_world.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql/updates/world/{2015_01_31_01_world.sql => 2015_03_15_01_world.sql} (100%) diff --git a/sql/updates/world/2015_01_31_01_world.sql b/sql/updates/world/2015_03_15_01_world.sql similarity index 100% rename from sql/updates/world/2015_01_31_01_world.sql rename to sql/updates/world/2015_03_15_01_world.sql From 9927bb241d3e0ef075944dbfdb0c8481d06204cb Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 15:49:41 +0100 Subject: [PATCH 09/26] DB/Quest: The Escape + Collecting Kelp --- sql/updates/world/2015_03_15_02_world.sql | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 sql/updates/world/2015_03_15_02_world.sql diff --git a/sql/updates/world/2015_03_15_02_world.sql b/sql/updates/world/2015_03_15_02_world.sql new file mode 100644 index 0000000000..0038b6a892 --- /dev/null +++ b/sql/updates/world/2015_03_15_02_world.sql @@ -0,0 +1,37 @@ +-- +-- William Pestle SAI +SET @ENTRY := 253; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,20,0,100,0,112,0,0,0,80,@ENTRY*100+00,0,2,0,0,0,1,0,0,0,0,0,0,0,"William Pestle - On Quest 'Collecting Kelp' Finished - Run Script"); + +-- Actionlist SAI +SET @ENTRY := 25300; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"William Pestle - On Script - Say Line 0"), +(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.45219,"William Pestle - On Script - Set Orientation 1,45219"), +(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,5,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"William Pestle - On Script - Play Emote 69"), +(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,21,10,0,0,0,0,0,0,"William Pestle - On Script - Set Orientation Closest Player"), +(@ENTRY,9,4,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"William Pestle - On Script - Say Line 1"); + +-- Maybell Maclure SAI +SET @ENTRY := 251; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,20,0,100,0,114,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Maybell Maclure - On Quest 'The Escape' Finished - Run Script"); + +-- Actionlist SAI +SET @ENTRY := 25100; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.39307,"On Script - Set Orientation 5,39307"), +(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"), +(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,5,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Play Emote 7"), +(@ENTRY,9,3,0,0,0,100,0,4000,4000,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Despawn Instant"); + +DELETE FROM `creature_text` WHERE `entry`=251; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(251, 0, 0, 'Here goes nothing...', 12, 0, 100, 0, 0, 0, 1862, 0, 'Maybell Maclure'); From 0014a9d1fc308e679438353c58626a76502d7970 Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 15:52:04 +0100 Subject: [PATCH 10/26] DB/SAI: Tortured Skeleton closes #14367 --- sql/updates/world/2015_03_15_03_world.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2015_03_15_03_world.sql diff --git a/sql/updates/world/2015_03_15_03_world.sql b/sql/updates/world/2015_03_15_03_world.sql new file mode 100644 index 0000000000..b9b4ea7a24 --- /dev/null +++ b/sql/updates/world/2015_03_15_03_world.sql @@ -0,0 +1,7 @@ +-- +-- Tortured Skeleton SAI +SET @ENTRY := 18797; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tortured Skeleton - On Aggro - Remove Flag Standstate Dead"); From 4afd3db36e80dcead6c4a9751eb2a16de68c66a2 Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 15:54:28 +0100 Subject: [PATCH 11/26] DB/Creature: Senetil Selarin closes #14364 --- sql/updates/world/2015_03_15_04_world.sql | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 sql/updates/world/2015_03_15_04_world.sql diff --git a/sql/updates/world/2015_03_15_04_world.sql b/sql/updates/world/2015_03_15_04_world.sql new file mode 100644 index 0000000000..b439d0f3a7 --- /dev/null +++ b/sql/updates/world/2015_03_15_04_world.sql @@ -0,0 +1,48 @@ +-- +-- Senetil Selarin spawn after completition of quest=995 or quest=994 +UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3694; +UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `Id`=990; +-- Terenthis SAI +SET @ENTRY := 3693; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,20,0,100,0,995,0,0,0,12,3694,6,180000,0,0,0,8,0,0,0,6339.14,341.764,24.3387,0.498114,"Terenthis - On Quest 'Escape Through Stealth' Finished - Summon Creature 'Sentinel Selarin'"), +(@ENTRY,0,1,0,20,0,100,0,994,0,0,0,12,3694,6,180000,0,0,0,8,0,0,0,6339.14,341.764,24.3387,0.498114,"Terenthis - On Quest 'Escape Through Force' Finished - Summon Creature 'Sentinel Selarin'"); + +-- Sentinel Selarin SAI +SET @ENTRY := 3694; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,2,54,0,100,0,0,0,0,0,53,1,3694,0,0,0,0,1,0,0,0,0,0,0,0,"Sentinel Selarin - On Just Summoned - Start Waypoint"), +(@ENTRY,0,1,0,40,0,100,0,23,3694,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sentinel Selarin - On Waypoint 23 Reached - Despawn Instant"), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sentinel Selarin - On Just Summoned - Set Active On"), +(@ENTRY,0,3,0,40,0,100,0,1,3694,0,0,54,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sentinel Selarin - On Waypoint 1 Reached - Pause Waypoint"), +(@ENTRY,0,4,0,40,0,100,0,12,3694,0,0,54,120000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sentinel Selarin - On Waypoint 12 Reached - Pause Waypoint"); + +DELETE FROM `waypoints` WHERE `entry`=3694; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(3694, 1, 6339.14,341.764,24.3387, 'Sentinel Selarin'), +(3694, 2, 6353.39,354.557,22.3779, 'Sentinel Selarin'), +(3694, 3, 6368.99,357.894,21.5712, 'Sentinel Selarin'), +(3694, 4, 6387.81,359.455,18.9899, 'Sentinel Selarin'), +(3694, 5, 6398.12,363.588,17.366, 'Sentinel Selarin'), +(3694, 6, 6403.68,370.92,15.6815, 'Sentinel Selarin'), +(3694, 7, 6416.57,392.998,12.0215, 'Sentinel Selarin'), +(3694, 8, 6424.95,399.193,10.9586, 'Sentinel Selarin'), +(3694, 9, 6428.93,396.971,11.1736, 'Sentinel Selarin'), +(3694, 10, 6432,388.708,13.7662, 'Sentinel Selarin'), +(3694, 11, 6436.71,375.264,13.9403, 'Sentinel Selarin'), +(3694, 12, 6434.92,367.203,13.9403, 'Sentinel Selarin'), +(3694, 13, 6436.9,374.833,13.9403, 'Sentinel Selarin'), +(3694, 14, 6431.63,389.723,13.5875, 'Sentinel Selarin'), +(3694, 15, 6428.84,397.45,11.0941, 'Sentinel Selarin'), +(3694, 16, 6424,400.084,10.9784, 'Sentinel Selarin'), +(3694, 17, 6413.76,392.804,12.2825, 'Sentinel Selarin'), +(3694, 18, 6401.4,368.195,16.4249, 'Sentinel Selarin'), +(3694, 19, 6393.69,360.887,18.1549, 'Sentinel Selarin'), +(3694, 20, 6377.21,357.731,20.6589, 'Sentinel Selarin'), +(3694, 21, 6358.35,357.353,22.2106, 'Sentinel Selarin'), +(3694, 22, 6348.45,352.662,22.6056, 'Sentinel Selarin'), +(3694, 23, 6322.42,326.649,25.3338, 'Sentinel Selarin'); From 00f97e3ca8e8362ad74396eb8d3c738d76e21240 Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 15:56:33 +0100 Subject: [PATCH 12/26] DB/Creature: Dread Tactician closes #14361 --- sql/updates/world/2015_03_15_05_world.sql | 234 ++++++++++++++++++++++ 1 file changed, 234 insertions(+) create mode 100644 sql/updates/world/2015_03_15_05_world.sql diff --git a/sql/updates/world/2015_03_15_05_world.sql b/sql/updates/world/2015_03_15_05_world.sql new file mode 100644 index 0000000000..8aed78b730 --- /dev/null +++ b/sql/updates/world/2015_03_15_05_world.sql @@ -0,0 +1,234 @@ +-- Dread Tactician +-- Pathing for Entry: 16959 'TDB FORMAT' +SET @NPC := 59170; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-306.8688,`position_y`=1556.233,`position_z`=41.73843 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-306.8688,1556.233,41.73843,0,0,0,0,100,0), +(@PATH,2,-303.8688,1555.983,40.73843,0,0,0,0,100,0), +(@PATH,3,-299.8688,1555.483,40.23843,0,0,0,0,100,0), +(@PATH,4,-297.8688,1555.233,39.48843,0,0,0,0,100,0), +(@PATH,5,-295.1188,1554.983,38.73843,0,0,0,0,100,0), +(@PATH,6,-292.1188,1554.483,38.48843,0,0,0,0,100,0), +(@PATH,7,-289.1188,1554.233,37.73843,0,0,0,0,100,0), +(@PATH,8,-287.1188,1553.983,37.23843,0,0,0,0,100,0), +(@PATH,9,-284.1188,1553.983,36.48843,0,0,0,0,100,0), +(@PATH,10,-283.8904,1553.79,36.20832,0,0,0,0,100,0), +(@PATH,11,-281.8904,1553.54,35.95832,0,0,0,0,100,0), +(@PATH,12,-275.6404,1556.04,35.70832,0,0,0,0,100,0), +(@PATH,13,-269.0029,1558.513,35.23201,0,0,0,0,100,0), +(@PATH,14,-270.5029,1562.263,35.98201,0,0,0,0,100,0), +(@PATH,15,-271.7529,1565.013,36.48201,0,0,0,0,100,0), +(@PATH,16,-272.7529,1567.513,36.98201,0,0,0,0,100,0), +(@PATH,17,-274.0029,1570.263,37.73201,0,0,0,0,100,0), +(@PATH,18,-275.0029,1573.013,38.48201,0,0,0,0,100,0), +(@PATH,19,-276.4716,1576.198,39.42199,0,0,0,0,100,0), +(@PATH,20,-278.2216,1576.948,39.92199,0,0,0,0,100,0), +(@PATH,21,-280.9716,1578.448,40.92199,0,0,0,0,100,0), +(@PATH,22,-283.7216,1579.698,41.67199,0,0,0,0,100,0), +(@PATH,23,-285.4716,1580.448,42.17199,0,0,0,0,100,0), +(@PATH,24,-287.9716,1581.698,42.92199,0,0,0,0,100,0), +(@PATH,25,-289.7216,1582.448,43.67199,0,0,0,0,100,0), +(@PATH,26,-291.4716,1583.448,44.42199,0,0,0,0,100,0), +(@PATH,27,-294.2216,1584.698,45.17199,0,0,0,0,100,0), +(@PATH,28,-294.3971,1584.785,45.42167,0,0,0,0,100,0), +(@PATH,29,-295.1471,1585.035,45.42167,0,0,0,0,100,0), +(@PATH,30,-304.3971,1576.535,45.92167,0,0,0,0,100,0), +(@PATH,31,-312.2731,1568.967,46.45709,0,0,0,0,100,0), +(@PATH,32,-318.7731,1561.467,45.70709,0,0,0,0,100,0), +(@PATH,33,-333.8887,1543.732,45.3224,0,0,0,0,100,0), +(@PATH,34,-333.6387,1540.732,44.5724,0,0,0,0,100,0), +(@PATH,35,-333.3887,1538.732,43.8224,0,0,0,0,100,0), +(@PATH,36,-333.3887,1536.732,43.3224,0,0,0,0,100,0), +(@PATH,37,-333.1387,1533.732,42.5724,0,0,0,0,100,0), +(@PATH,38,-332.8887,1531.732,41.8224,0,0,0,0,100,0), +(@PATH,39,-332.8887,1529.732,41.0724,0,0,0,0,100,0), +(@PATH,40,-332.6387,1527.732,40.5724,0,0,0,0,100,0), +(@PATH,41,-332.3887,1525.732,39.8224,0,0,0,0,100,0), +(@PATH,42,-332.3887,1523.732,39.3224,0,0,0,0,100,0), +(@PATH,43,-332.1387,1521.982,38.8224,0,0,0,0,100,0), +(@PATH,44,-331.8887,1518.982,38.3224,0,0,0,0,100,0), +(@PATH,45,-331.8887,1516.982,37.5724,0,0,0,0,100,0), +(@PATH,46,-331.8887,1513.982,36.8224,0,0,0,0,100,0), +(@PATH,47,-331.6387,1510.982,36.3224,0,0,0,0,100,0), +(@PATH,48,-331.3887,1508.232,35.5724,0,0,0,0,100,0), +(@PATH,49,-331.1387,1505.232,34.8224,0,0,0,0,100,0), +(@PATH,50,-330.8887,1502.232,34.3224,0,0,0,0,100,0), +(@PATH,51,-330.4729,1499.82,33.45189,0,0,0,0,100,0), +(@PATH,52,-325.4729,1496.82,32.70189,0,0,0,0,100,0), +(@PATH,53,-320.9729,1494.32,31.95189,0,0,0,0,100,0), +(@PATH,54,-316.2229,1491.57,31.45189,0,0,0,0,100,0), +(@PATH,55,-311.7229,1489.07,30.95189,0,0,0,0,100,0), +(@PATH,56,-307.4729,1486.57,30.20189,0,0,0,0,100,0), +(@PATH,57,-307.3154,1486.395,29.88731,0,0,0,0,100,0), +(@PATH,58,-305.8154,1485.645,29.63731,0,0,0,0,100,0), +(@PATH,59,-299.8154,1485.645,28.88731,0,0,0,0,100,0), +(@PATH,60,-294.0654,1485.395,28.38731,0,0,0,0,100,0), +(@PATH,61,-287.0654,1485.395,27.88731,0,0,0,0,100,0), +(@PATH,62,-281.0654,1485.395,27.38731,0,0,0,0,100,0), +(@PATH,63,-280.6106,1485.449,27.23963,0,0,0,0,100,0), +(@PATH,64,-278.6106,1485.199,27.23963,0,0,0,0,100,0), +(@PATH,65,-270.6106,1498.699,27.48963,0,0,0,0,100,0), +(@PATH,66,-268.6106,1502.199,27.98963,0,0,0,0,100,0), +(@PATH,67,-268.5272,1502.318,28.20654,0,0,0,0,100,0), +(@PATH,68,-267.5272,1503.818,28.20654,0,0,0,0,100,0), +(@PATH,69,-270.5272,1504.568,28.70654,0,0,0,0,100,0), +(@PATH,70,-274.2772,1505.568,29.20654,0,0,0,0,100,0), +(@PATH,71,-278.5582,1506.635,29.73862,0,0,0,0,100,0), +(@PATH,72,-290.8082,1500.885,30.23862,0,0,0,0,100,0), +(@PATH,73,-296.4533,1498.203,30.9129,0,0,0,0,100,0), +(@PATH,74,-300.2033,1498.953,31.4129,0,0,0,0,100,0), +(@PATH,75,-304.2033,1499.703,31.9129,0,0,0,0,100,0), +(@PATH,76,-307.9533,1500.453,32.4129,0,0,0,0,100,0), +(@PATH,77,-313.7033,1501.203,33.1629,0,0,0,0,100,0), +(@PATH,78,-317.4067,1502.011,33.47455,0,0,0,0,100,0), +(@PATH,79,-319.6567,1504.011,33.97455,0,0,0,0,100,0), +(@PATH,80,-322.1567,1506.511,34.47455,0,0,0,0,100,0), +(@PATH,81,-325.2614,1509.541,35.46749,0,0,0,0,100,0), +(@PATH,82,-325.7614,1512.541,35.96749,0,0,0,0,100,0), +(@PATH,83,-326.0114,1515.541,36.71749,0,0,0,0,100,0), +(@PATH,84,-326.2614,1517.541,37.21749,0,0,0,0,100,0), +(@PATH,85,-326.2614,1520.541,38.21749,0,0,0,0,100,0), +(@PATH,86,-326.5114,1522.541,38.71749,0,0,0,0,100,0), +(@PATH,87,-326.7614,1525.291,39.46749,0,0,0,0,100,0), +(@PATH,88,-327.0114,1527.291,39.96749,0,0,0,0,100,0), +(@PATH,89,-327.2614,1529.291,40.71749,0,0,0,0,100,0), +(@PATH,90,-327.7614,1533.291,41.46749,0,0,0,0,100,0), +(@PATH,91,-328.0114,1535.041,41.96749,0,0,0,0,100,0), +(@PATH,92,-328.2614,1538.041,42.71749,0,0,0,0,100,0); +-- 0x1C39AC4240108FC00000210000037184 .go -306.8688 1556.233 41.73843 + + +-- Pathing for Entry: 16959 'TDB FORMAT' +SET @NPC := 59171; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-110.5204,`position_y`=1566.893,`position_z`=42.31397 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-110.5204,1566.893,42.31397,0,0,0,0,100,0), +(@PATH,2,-120.2704,1568.393,41.81397,0,0,0,0,100,0), +(@PATH,3,-127.0204,1569.893,41.31397,0,0,0,0,100,0), +(@PATH,4,-134.6927,1571.43,40.71382,0,0,0,0,100,0), +(@PATH,5,-139.6927,1571.68,40.21382,0,0,0,0,100,0), +(@PATH,6,-144.6927,1571.93,39.46382,0,0,0,0,100,0), +(@PATH,7,-149.4427,1572.18,38.71382,0,0,0,0,100,0), +(@PATH,8,-152.4427,1572.43,38.21382,0,0,0,0,100,0), +(@PATH,9,-155.4427,1572.68,37.71382,0,0,0,0,100,0), +(@PATH,10,-158.4427,1572.68,36.96382,0,0,0,0,100,0), +(@PATH,11,-161.4427,1572.93,36.46382,0,0,0,0,100,0), +(@PATH,12,-163.4427,1573.18,35.71382,0,0,0,0,100,0), +(@PATH,13,-163.4854,1573.449,35.89986,0,0,0,0,100,0), +(@PATH,14,-164.2354,1573.449,35.64986,0,0,0,0,100,0), +(@PATH,15,-163.9854,1576.449,36.39986,0,0,0,0,100,0), +(@PATH,16,-163.7824,1580.185,36.84877,0,0,0,0,100,0), +(@PATH,17,-161.7824,1580.435,37.59877,0,0,0,0,100,0), +(@PATH,18,-159.0324,1580.935,38.34877,0,0,0,0,100,0), +(@PATH,19,-155.0324,1581.935,38.84877,0,0,0,0,100,0), +(@PATH,20,-152.2824,1582.685,39.59877,0,0,0,0,100,0), +(@PATH,21,-148.5324,1583.435,40.34877,0,0,0,0,100,0), +(@PATH,22,-145.5324,1584.185,41.09877,0,0,0,0,100,0), +(@PATH,23,-145.3761,1584.15,41.32778,0,0,0,0,100,0), +(@PATH,24,-144.1261,1584.4,41.57778,0,0,0,0,100,0), +(@PATH,25,-139.1261,1583.9,42.32778,0,0,0,0,100,0), +(@PATH,26,-135.1261,1583.65,43.07778,0,0,0,0,100,0), +(@PATH,27,-130.1261,1583.15,43.57778,0,0,0,0,100,0), +(@PATH,28,-126.3761,1582.65,44.07778,0,0,0,0,100,0), +(@PATH,29,-123.3761,1582.4,44.82778,0,0,0,0,100,0), +(@PATH,30,-117.3761,1582.15,45.32778,0,0,0,0,100,0), +(@PATH,31,-113.3761,1581.65,46.07778,0,0,0,0,100,0), +(@PATH,32,-109.0603,1580.944,46.36949,0,0,0,0,100,0), +(@PATH,33,-84.0918,1569.51,46.44577,0,0,0,0,100,0), +(@PATH,34,-82.3418,1566.01,45.44577,0,0,0,0,100,0), +(@PATH,35,-81.3418,1564.26,44.94577,0,0,0,0,100,0), +(@PATH,36,-80.0918,1561.51,44.19577,0,0,0,0,100,0), +(@PATH,37,-79.0918,1559.76,43.69577,0,0,0,0,100,0), +(@PATH,38,-78.0918,1558.01,42.94577,0,0,0,0,100,0), +(@PATH,39,-76.5918,1554.76,42.19577,0,0,0,0,100,0), +(@PATH,40,-75.8418,1553.01,41.69577,0,0,0,0,100,0), +(@PATH,41,-74.8418,1551.26,41.19577,0,0,0,0,100,0), +(@PATH,42,-73.3418,1548.51,40.44577,0,0,0,0,100,0), +(@PATH,43,-72.5918,1546.76,39.94577,0,0,0,0,100,0), +(@PATH,44,-71.5918,1545.01,39.19577,0,0,0,0,100,0), +(@PATH,45,-70.3418,1542.26,38.69577,0,0,0,0,100,0), +(@PATH,46,-70.29829,1541.94,38.42153,0,0,0,0,100,0), +(@PATH,47,-69.29829,1540.19,37.67153,0,0,0,0,100,0), +(@PATH,48,-69.54829,1538.19,37.17153,0,0,0,0,100,0), +(@PATH,49,-70.04829,1535.19,36.17153,0,0,0,0,100,0), +(@PATH,50,-70.04829,1533.44,35.67153,0,0,0,0,100,0), +(@PATH,51,-70.54829,1529.44,35.17153,0,0,0,0,100,0), +(@PATH,52,-71.04829,1525.69,34.42153,0,0,0,0,100,0), +(@PATH,53,-71.54829,1521.69,33.92153,0,0,0,0,100,0), +(@PATH,54,-71.54829,1518.69,33.17153,0,0,0,0,100,0), +(@PATH,55,-72.10271,1515.561,32.53027,0,0,0,0,100,0), +(@PATH,56,-73.35271,1512.811,31.53027,0,0,0,0,100,0), +(@PATH,57,-74.35271,1511.061,30.78027,0,0,0,0,100,0), +(@PATH,58,-75.10271,1509.311,30.28027,0,0,0,0,100,0), +(@PATH,59,-76.35271,1506.561,29.78027,0,0,0,0,100,0), +(@PATH,60,-78.10271,1502.811,29.03027,0,0,0,0,100,0), +(@PATH,61,-79.10271,1500.311,30.03027,0,0,0,0,100,0), +(@PATH,62,-82.35271,1493.061,29.28027,0,0,0,0,100,0), +(@PATH,63,-84.10271,1489.561,28.53027,0,0,0,0,100,0), +(@PATH,64,-84.42598,1489.16,28.3833,0,0,0,0,100,0), +(@PATH,65,-85.17598,1487.41,28.1333,0,0,0,0,100,0), +(@PATH,66,-102.3677,1477.751,27.65215,0,0,0,0,100,0), +(@PATH,67,-123.1177,1477.501,26.90215,0,0,0,0,100,0), +(@PATH,68,-137.5984,1477.31,26.80837,0,0,0,0,100,0), +(@PATH,69,-145.5984,1482.56,27.05837,0,0,0,0,100,0), +(@PATH,70,-153.8199,1488.331,27.38618,0,0,0,0,100,0), +(@PATH,71,-178.7361,1511.036,27.3082,0,0,0,0,100,0), +(@PATH,72,-185.2269,1510.27,27.05297,0,0,0,0,100,0), +(@PATH,73,-182.9769,1508.27,27.05297,0,0,0,0,100,0), +(@PATH,74,-172.9769,1500.02,26.80297,0,0,0,0,100,0), +(@PATH,75,-170.7269,1498.27,27.05297,0,0,0,0,100,0), +(@PATH,76,-169.2269,1496.02,27.05297,0,0,0,0,100,0), +(@PATH,77,-167.7269,1494.02,26.80297,0,0,0,0,100,0), +(@PATH,78,-167.7269,1492.02,26.80297,0,0,0,0,100,0), +(@PATH,79,-167.7269,1489.77,26.80297,0,0,0,0,100,0), +(@PATH,80,-167.4919,1489.571,26.64043,0,0,0,0,100,0), +(@PATH,81,-168.4919,1488.071,26.64043,0,0,0,0,100,0), +(@PATH,82,-158.2419,1482.071,26.14043,0,0,0,0,100,0), +(@PATH,83,-147.591,1475.386,26.25293,0,0,0,0,100,0), +(@PATH,84,-139.841,1477.636,27.00293,0,0,0,0,100,0), +(@PATH,85,-132.341,1479.636,27.25293,0,0,0,0,100,0), +(@PATH,86,-125.591,1481.386,28.00293,0,0,0,0,100,0), +(@PATH,87,-121.841,1482.636,28.50293,0,0,0,0,100,0), +(@PATH,88,-120.2695,1483.081,29.04744,0,0,0,0,100,0), +(@PATH,89,-118.5195,1484.081,29.54744,0,0,0,0,100,0), +(@PATH,90,-115.7695,1485.331,30.29744,0,0,0,0,100,0), +(@PATH,91,-115.0195,1485.831,31.04744,0,0,0,0,100,0), +(@PATH,92,-113.0195,1486.831,32.04744,0,0,0,0,100,0), +(@PATH,93,-107.0195,1489.581,31.29744,0,0,0,0,100,0), +(@PATH,94,-95.5195,1495.331,30.79744,0,0,0,0,100,0), +(@PATH,95,-95.16714,1495.663,31.08524,0,0,0,0,100,0), +(@PATH,96,-94.66714,1495.913,31.08524,0,0,0,0,100,0), +(@PATH,97,-93.66714,1499.913,31.33524,0,0,0,0,100,0), +(@PATH,98,-92.16714,1506.413,31.83524,0,0,0,0,100,0), +(@PATH,99,-90.66714,1512.163,32.58524,0,0,0,0,100,0), +(@PATH,100,-89.91714,1514.913,31.83524,0,0,0,0,100,0), +(@PATH,101,-89.75613,1515.401,32.07003,0,0,0,0,100,0), +(@PATH,102,-89.25613,1516.401,31.82003,0,0,0,0,100,0), +(@PATH,103,-89.25613,1523.401,32.57003,0,0,0,0,100,0), +(@PATH,104,-89.25613,1524.401,33.32003,0,0,0,0,100,0), +(@PATH,105,-89.25613,1525.401,34.07003,0,0,0,0,100,0), +(@PATH,106,-89.00613,1526.401,34.57003,0,0,0,0,100,0), +(@PATH,107,-89.00613,1528.401,35.82003,0,0,0,0,100,0), +(@PATH,108,-89.00613,1529.401,36.07003,0,0,0,0,100,0), +(@PATH,109,-88.75613,1533.151,36.82003,0,0,0,0,100,0), +(@PATH,110,-88.75613,1535.151,37.32003,0,0,0,0,100,0), +(@PATH,111,-88.50613,1538.151,38.07003,0,0,0,0,100,0), +(@PATH,112,-88.50613,1541.151,38.82003,0,0,0,0,100,0), +(@PATH,113,-88.25613,1544.151,39.57003,0,0,0,0,100,0), +(@PATH,114,-88.1545,1544.429,39.72079,0,0,0,0,100,0), +(@PATH,115,-88.1545,1545.429,39.97079,0,0,0,0,100,0), +(@PATH,116,-91.1545,1548.179,40.47079,0,0,0,0,100,0), +(@PATH,117,-94.6545,1551.679,40.97079,0,0,0,0,100,0), +(@PATH,118,-99.4045,1556.429,41.72079,0,0,0,0,100,0), +(@PATH,119,-110.481,1566.873,42.2832,0,0,0,0,100,0), +(@PATH,120,-120.231,1568.623,41.7832,0,0,0,0,100,0), +(@PATH,121,-126.981,1569.873,41.2832,0,0,0,0,100,0); +-- 0x1C39AC4240108FC000002100007FC923 .go -110.5204 1566.893 42.31397 From 549bb122d0183bace3303513bd6dc7c282b2720e Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 15:58:59 +0100 Subject: [PATCH 13/26] DB/Creature: Spirit of Sathrah closes #14360 --- sql/updates/world/2015_03_15_06_world.sql | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 sql/updates/world/2015_03_15_06_world.sql diff --git a/sql/updates/world/2015_03_15_06_world.sql b/sql/updates/world/2015_03_15_06_world.sql new file mode 100644 index 0000000000..4fc3ab011a --- /dev/null +++ b/sql/updates/world/2015_03_15_06_world.sql @@ -0,0 +1,24 @@ +-- +DELETE FROM `event_scripts` WHERE `id`=2313; +INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES +(2313, 0, 10, 7411, 3000000, 0, 9639.5,2528.97,1331.72,5.28395); + +-- Spirit of Sathrah SAI +SET @ENTRY := 7411; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,53,0,7411,0,0,0,0,1,0,0,0,0,0,0,0,"Spirit of Sathrah - On Just Summoned - Start Waypoint"), +(@ENTRY,0,1,0,40,0,100,0,9,7411,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Spirit of Sathrah - On Waypoint 9 Reached - Despawn In 3000 ms"); + +DELETE FROM `waypoints` WHERE `entry`=7411; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(7411, 1, 9642.47,2523.25,1331.54, 'Spirit of Sathrah'), +(7411, 2, 9640.32,2517.43,1331.57, 'Spirit of Sathrah'), +(7411, 3, 9635.62,2514.35,1331.4, 'Spirit of Sathrah'), +(7411, 4, 9630.91,2515.59,1331.72, 'Spirit of Sathrah'), +(7411, 5, 9626.52,2520.1,1331.73, 'Spirit of Sathrah'), +(7411, 6, 9625.02,2526.36,1331.61, 'Spirit of Sathrah'), +(7411, 7, 9630.56,2532.58,1331.39, 'Spirit of Sathrah'), +(7411, 8, 9636.59,2532.65,1331.73, 'Spirit of Sathrah'), +(7411, 9, 9640.05,2529.06,1331.77, 'Spirit of Sathrah'); From 7af2a49e635000c5abd68ed2ae99d9075d55dfbf Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 16:01:54 +0100 Subject: [PATCH 14/26] DB/Quest: Disrupt Their Reinforcements * Flameevent for Portals closes #14359 --- sql/updates/world/2015_03_15_07_world.sql | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 sql/updates/world/2015_03_15_07_world.sql diff --git a/sql/updates/world/2015_03_15_07_world.sql b/sql/updates/world/2015_03_15_07_world.sql new file mode 100644 index 0000000000..64f813d2c5 --- /dev/null +++ b/sql/updates/world/2015_03_15_07_world.sql @@ -0,0 +1,29 @@ +-- +-- Portal Burn Action +-- Portal Kruul SAI +SET @ENTRY := 184289; +UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,50,183816,30,0,0,0,0,8,0,0,0,147.0184, 1717.341, 37.46404,0,"Portal Kruul - On Gameobject State Changed - Summon Gameobject 'Hellfire Fire'"); + +-- Portal Xilus SAI +SET @ENTRY := 184290; +UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,50,183816,30,0,0,0,0,8,0,0,0,-84.5415, 1881.739, 73.82645,5.782852,"Portal Xilus - On Gameobject State Changed - Summon Gameobject 'Hellfire Fire'"); + +-- Portal Grimh SAI +SET @ENTRY := 184414; +UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,50,183816,30,0,0,0,0,8,0,0,0,-418.627, 1847.49, 80.7808,0,"Portal Grimh - On Gameobject State Changed - Summon Gameobject 'Hellfire Fire'"); + +-- Portal Kaalez SAI +SET @ENTRY := 184415; +UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,50,183816,30,0,0,0,0,8,0,0,0,-545.2587, 1781.167, 56.22634,0,"Portal Kaalez - On Gameobject State Changed - Summon Gameobject 'Hellfire Fire'"); From 810b998e773f5cb9d8f83c1089b534900fcee84b Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 16:04:02 +0100 Subject: [PATCH 15/26] DB/Creature: Expedition Warden * Events for Creatures on the 'Wyrmskull Bridge' closes #14358 --- sql/updates/world/2015_03_15_08_world.sql | 81 +++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 sql/updates/world/2015_03_15_08_world.sql diff --git a/sql/updates/world/2015_03_15_08_world.sql b/sql/updates/world/2015_03_15_08_world.sql new file mode 100644 index 0000000000..e7acf61bbd --- /dev/null +++ b/sql/updates/world/2015_03_15_08_world.sql @@ -0,0 +1,81 @@ +-- +-- Pathing for Entry: 22410 'TDB FORMAT' +SET @NPC := 78754; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3009.127,`position_y`=5920.842,`position_z`=130.9854 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,14332,0,4097,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3009.127,5920.842,130.9854,0,0,1,0,100,0), +(@PATH,2,3018.56,5944.067,131.0012,0,0,1,0,100,0), +(@PATH,3,3028.687,5971.723,131.0047,0,0,1,0,100,0), +(@PATH,4,3039.209,5998.325,130.9491,0,0,1,0,100,0), +(@PATH,5,3041.459,6004.325,130.9491,0,0,1,0,100,0), +(@PATH,6,3042.709,6007.575,130.9491,0,0,1,0,100,0), +(@PATH,7,3043.459,6009.825,130.9491,0,0,1,0,100,0), +(@PATH,8,3048.21,6021.786,130.8358,0,0,1,0,100,0), +(@PATH,9,3058.211,6046.689,130.7168,0,0,1,0,100,0), +(@PATH,10,3065.155,6064.995,130.614,0,0,1,0,100,0), +(@PATH,11,3078.91,6073.112,130.3709,0,0,1,0,100,0), +(@PATH,12,3084.571,6056.194,130.4195,0,0,1,0,100,0), +(@PATH,13,3079.821,6040.444,130.6695,0,0,1,0,100,0), +(@PATH,14,3079.655,6040.126,130.764,0,0,1,0,100,0), +(@PATH,15,3079.405,6039.626,130.764,0,0,1,0,100,0), +(@PATH,16,3078.905,6038.126,130.764,0,0,1,0,100,0), +(@PATH,17,3069.25,6014.667,130.9082,0,0,1,0,100,0), +(@PATH,18,3064,6000.667,130.9082,0,0,1,0,100,0), +(@PATH,19,3060.452,5991.971,130.99,0,0,1,0,100,0), +(@PATH,20,3050.27,5967.535,130.9908,0,0,1,0,100,0), +(@PATH,21,3045.52,5954.535,130.9908,0,0,1,0,100,0), +(@PATH,22,3039.294,5938.282,130.9514,0,0,1,0,100,0), +(@PATH,23,3028.456,5913.517,130.8795,0,0,1,0,100,0), +(@PATH,24,3019.764,5891.665,130.7868,0,0,1,0,100,0), +(@PATH,25,3016.764,5884.415,130.7868,0,0,1,0,100,0), +(@PATH,26,3012.264,5873.915,130.7868,0,0,1,0,100,0), +(@PATH,27,3009.264,5866.915,130.7868,0,0,1,0,100,0), +(@PATH,28,3012.196,5873.788,130.7515,0,0,1,0,100,0), +(@PATH,29,3008.946,5866.788,130.7515,0,0,1,0,100,0), +(@PATH,30,3008.446,5865.038,130.7515,0,0,1,0,100,0), +(@PATH,31,2995.446,5836.038,130.5015,0,0,1,0,100,0), +(@PATH,32,2995.104,5835.657,130.3808,0,0,1,0,100,0), +(@PATH,33,2991.854,5828.407,130.6308,0,0,1,0,100,0), +(@PATH,34,2990.604,5827.907,130.3808,0,0,1,0,100,0), +(@PATH,35,2976.186,5821.571,130.1743,0,0,1,0,100,0), +(@PATH,36,2970.518,5837.316,130.481,0,0,1,0,100,0), +(@PATH,37,2971.768,5840.066,130.481,0,0,1,0,100,0), +(@PATH,38,2980.487,5859.262,131.0515,0,0,1,0,100,0), +(@PATH,39,2983.987,5866.762,131.0515,0,0,1,0,100,0), +(@PATH,40,2989.237,5876.512,131.3015,0,0,1,0,100,0); +-- 0x1C3998424015E28000002300007FC920 .go 3009.127 5920.842 130.9854 + +DELETE FROM `creature_formations` WHERE `leaderGUID`=78754; +INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES +(78754, 78754, 0, 0, 2, 0, 0), +(78754, 78755, 7, 0, 0, 0, 0); + +-- Expedition Warden SAI +SET @GUID := -63549; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=17855; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@GUID,0,0,0,1,0,100,0,100,200,5000,10000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Expedition Warden - Out of Combat - Play Emote 1"); + +-- Expedition Warden SAI +SET @GUID := -63548; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=17855; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@GUID,0,0,0,1,0,100,0,100,200,10000,40000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Expedition Warden - Out of Combat - Play Emote 1"); + +-- Pathing for Entry: 17855 'TDB FORMAT' +SET @NPC := 63550; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3022.651,`position_y`=5963.609,`position_z`=130.7766 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3022.651,5963.609,130.7766,0,6000,0,0,100,0), +(@PATH,2,3032.096,5959.558,130.6869,0,6000,0,0,100,0); +-- 0x1C39984240116FC000002300027FC920 .go 3022.651 5963.609 130.7766 From ca174e4239b4801996da22adfdf9d82919852eb1 Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 16:06:11 +0100 Subject: [PATCH 16/26] DB/Creature: Susan Tillinghast closes #14356 --- sql/updates/world/2015_03_15_09_world.sql | 59 +++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 sql/updates/world/2015_03_15_09_world.sql diff --git a/sql/updates/world/2015_03_15_09_world.sql b/sql/updates/world/2015_03_15_09_world.sql new file mode 100644 index 0000000000..cb453b9b4a --- /dev/null +++ b/sql/updates/world/2015_03_15_09_world.sql @@ -0,0 +1,59 @@ +-- +-- Pathing for Entry: 2802 'TDB FORMAT' +SET @NPC := 38101; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1442.487,`position_y`=36.32697,`position_z`=-62.02626 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,1442.487,36.32697,-62.02626,0,0,0,0,100,0), +(@PATH,2,1435.487,32.07697,-62.02626,0,0,0,0,100,0), +(@PATH,3,1416.445,21.46703,-62.02588,0,0,0,0,100,0), +(@PATH,4,1405.551,23.91475,-62.0261,0,0,0,0,100,0), +(@PATH,5,1402.301,26.41475,-62.0261,0,0,0,0,100,0), +(@PATH,6,1387.127,36.88569,-62.02647,0,0,0,0,100,0), +(@PATH,7,1381.627,49.88569,-62.02647,0,0,0,0,100,0), +(@PATH,8,1379.005,56.32278,-62.02669,0,0,0,0,100,0), +(@PATH,9,1379.755,60.82278,-62.02669,0,0,0,0,100,0), +(@PATH,10,1383.399,83.51677,-62.03289,0,0,0,0,100,0), +(@PATH,11,1388.399,87.51677,-62.03289,0,0,0,0,100,0), +(@PATH,12,1395.899,94.01677,-62.28289,0,0,0,0,100,0), +(@PATH,13,1400.163,97.49232,-62.05746,0,0,0,0,100,0), +(@PATH,14,1412.663,127.9923,-62.05746,0,0,0,0,100,0), +(@PATH,15,1413.663,130.2423,-62.05746,0,0,0,0,100,0), +(@PATH,16,1415.163,134.2423,-62.05746,0,0,0,0,100,0), +(@PATH,17,1418.154,141.2391,-62.04066,0,0,0,0,100,0), +(@PATH,18,1423.404,143.7391,-62.04066,0,0,0,0,100,0), +(@PATH,19,1434.169,149.9652,-62.03992,0,0,0,0,100,0), +(@PATH,20,1435.669,148.4652,-62.03992,0,0,0,0,100,0), +(@PATH,21,1445.419,139.4652,-62.03992,0,0,0,0,100,0), +(@PATH,22,1447.836,137.2073,-61.75176,0,0,0,0,100,0), +(@PATH,23,1450.836,133.7073,-61.75176,0,0,0,0,100,0), +(@PATH,24,1452.086,132.4573,-61.75176,0,0,0,0,100,0), +(@PATH,25,1453.836,130.4573,-60.00176,0,0,0,0,100,0), +(@PATH,26,1456.336,127.4573,-60.00176,0,0,0,0,100,0), +(@PATH,27,1462.008,120.8724,-59.94119,0,0,0,0,100,0), +(@PATH,28,1465.152,111.2505,-59.94151,0,0,0,0,100,0), +(@PATH,29,1471.402,105.7505,-59.94151,0,0,0,0,100,0), +(@PATH,30,1479.847,98.11646,-59.9706,0,0,0,0,100,0), +(@PATH,31,1480.847,97.36646,-59.9706,0,0,0,0,100,0), +(@PATH,32,1482.847,96.11646,-61.4706,0,0,0,0,100,0), +(@PATH,33,1484.347,95.11646,-61.7206,0,0,0,0,100,0), +(@PATH,34,1483.158,95.78064,-61.62843,0,0,0,0,100,0), +(@PATH,35,1484.658,94.78064,-61.87843,0,0,0,0,100,0), +(@PATH,36,1485.158,94.53064,-61.87843,0,0,0,0,100,0), +(@PATH,37,1489.658,90.78064,-61.87843,0,0,0,0,100,0), +(@PATH,38,1499.658,82.28064,-61.87843,0,0,0,0,100,0), +(@PATH,39,1499.686,82.06802,-62.047,0,0,0,0,100,0), +(@PATH,40,1500.436,81.31802,-62.047,0,0,0,0,100,0), +(@PATH,41,1494.936,71.31802,-62.047,0,0,0,0,100,0), +(@PATH,42,1481.826,47.66472,-62.03592,0,0,0,0,100,0), +(@PATH,43,1469.576,44.16472,-62.03592,0,0,0,0,100,0), +(@PATH,44,1466.576,43.41472,-62.03592,0,0,0,0,100,0), +(@PATH,45,1464.826,42.91472,-62.03592,0,0,0,0,100,0), +(@PATH,46,1452.326,39.16472,-62.03592,0,0,0,0,100,0), +(@PATH,47,1442.51,36.29097,-62.02619,0,0,0,0,100,0), +(@PATH,48,1435.51,32.29097,-62.02619,0,0,0,0,100,0), +(@PATH,49,1416.5,21.42531,-62.02593,0,0,0,0,100,0); +-- 0x1C191C000002BC80000028000002D330 .go 1442.487 36.32697 -62.02626 From 1d8f98d988171fab895b23c2d0ca2d2fb39d352f Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 16:08:23 +0100 Subject: [PATCH 17/26] DB/Object: Stone of Remembrance * thx @Kittnz for providing the datas closes #14363 --- sql/updates/world/2015_03_15_10_world.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2015_03_15_10_world.sql diff --git a/sql/updates/world/2015_03_15_10_world.sql b/sql/updates/world/2015_03_15_10_world.sql new file mode 100644 index 0000000000..b639c81376 --- /dev/null +++ b/sql/updates/world/2015_03_15_10_world.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `gossip_menu` WHERE `entry`=5004; +INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (5004, 6062); From 04e1f35043f95969e4600901fa22171a90c8afee Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 16:12:19 +0100 Subject: [PATCH 18/26] DB/SAI: Scarlet Initiate by pete318 closes #14355 --- sql/updates/world/2015_03_15_11_world.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2015_03_15_11_world.sql diff --git a/sql/updates/world/2015_03_15_11_world.sql b/sql/updates/world/2015_03_15_11_world.sql new file mode 100644 index 0000000000..3330613ef6 --- /dev/null +++ b/sql/updates/world/2015_03_15_11_world.sql @@ -0,0 +1,8 @@ +-- +-- Scarlet Initiate SAI +SET @ENTRY := 1507; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,7,0,0,0,100,0,0,0,3500,5000,11,20793,64,0,0,0,0,2,0,0,0,0,0,0,0,"Scarlet Initiate - In Combat - Cast 'Fireball'"), +(@ENTRY,0,10,0,23,0,100,0,12544,0,5000,10000,11,12544,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Initiate - On Has Aura 'Frost Armor' - Cast 'Frost Armor'"); From efaf50c9405ca11b4cd80fa8808227e116398064 Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 16:20:00 +0100 Subject: [PATCH 19/26] DB/Quest: Take the letter #closes 12775 --- sql/updates/world/2015_03_15_12_world.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 sql/updates/world/2015_03_15_12_world.sql diff --git a/sql/updates/world/2015_03_15_12_world.sql b/sql/updates/world/2015_03_15_12_world.sql new file mode 100644 index 0000000000..7eb2c70421 --- /dev/null +++ b/sql/updates/world/2015_03_15_12_world.sql @@ -0,0 +1,13 @@ +-- +-- Keryn Sylvius SAI +SET @ENTRY := 917; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,62,0,100,0,381,4,0,0,11,21100,0,0,0,0,0,7,0,0,0,0,0,0,0,"Keryn Sylvius - On Gossip Option 4 Selected - Cast 'Conjure Elegant Letter'"); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=381 AND `SourceEntry`=4; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15, 381, 4, 0, 0, 15, 0, 8, 0, 0, 0, 0, 0, '', 'Show gossip text if player is a rogue'), +(15, 381, 4, 0, 0, 27, 0, 24, 3, 0, 0, 0, 0, '', 'Show gossip text if level >= 24'), +(15, 381, 4, 0, 0, 2, 0, 17126, 1, 0, 1, 0, 0, '', 'Show gossip option if player does not have Elegant Letter'); From 24821213c9c69b81bab861d537c69427571267c3 Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 16:49:24 +0100 Subject: [PATCH 20/26] DB/Quest: A Crew Under Fire closes #1678 --- sql/updates/world/2015_03_15_13_world.sql | 153 ++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 sql/updates/world/2015_03_15_13_world.sql diff --git a/sql/updates/world/2015_03_15_13_world.sql b/sql/updates/world/2015_03_15_13_world.sql new file mode 100644 index 0000000000..f88dd64154 --- /dev/null +++ b/sql/updates/world/2015_03_15_13_world.sql @@ -0,0 +1,153 @@ +-- A Crew Under Fire +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=8380; +UPDATE `quest_template` SET `SpecialFlags`=2 WHERE `Id`=3382; +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry` IN (12205, 12204); +UPDATE `creature` SET orientation = 2.43043 WHERE guid = 35899; + +-- Captain Vanessa Beltis SAI +SET @ENTRY := 8380; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,19,0,100,0,3382,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Quest 'A Crew Under Fire' Taken - Run Script"), +(@ENTRY,0,1,4,61,0,100,0,3382,0,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Quest 'A Crew Under Fire' Taken - Set Faction 250"), +(@ENTRY,0,2,5,11,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Respawn - Set Faction 35"), +(@ENTRY,0,3,0,6,0,100,0,0,0,0,0,6,3382,0,0,0,0,0,17,0,50,0,0,0,0,0,"Captain Vanessa Beltis - On Just Died - Fail Quest 'A Crew Under Fire'"), +(@ENTRY,0,4,0,61,0,100,0,3382,0,0,0,82,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Quest 'A Crew Under Fire' Taken - Add Npc Flag "), +(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Respawn - Add Npc Flags Gossip & Questgiver"); + +-- Spitelash Witch SAI +SET @ENTRY := 12205; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,8,0,100,0,118,0,8000,8000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Spitelash Witch - On Spellhit 'Polymorph' - Run Script"), +(@ENTRY,0,1,0,8,0,100,0,12824,0,8000,8000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Spitelash Witch - On Spellhit 'Polymorph' - Run Script"), +(@ENTRY,0,2,0,8,0,100,0,12825,0,8000,8000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Spitelash Witch - On Spellhit 'Polymorph' - Run Script"), +(@ENTRY,0,3,0,8,0,100,0,12826,0,8000,8000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Spitelash Witch - On Spellhit 'Polymorph' - Run Script"), +(@ENTRY,0,4,0,54,0,100,0,0,0,0,0,53,1,12205,0,0,0,2,1,0,0,0,0,0,0,0,"Spitelash Witch - On Just Summoned - Start Waypoint"), +(@ENTRY,0,5,0,1,0,100,0,1000,1000,60000,60000,11,12550,2,0,0,0,0,1,0,0,0,0,0,0,0,"Spitelash Witch - Out of Combat - Cast 'Lightning Shield'"), +(@ENTRY,0,6,0,0,0,100,0,2000,2000,4000,5000,11,9672,0,0,0,0,0,2,0,0,0,0,0,0,0,"Spitelash Witch - In Combat - Cast 'Frostbolt'"); + +DELETE FROM `waypoints` WHERE `entry`=12205; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(12205, 1, 2370.83,-5893.06,10.6607, 'Spitelash Witch'), +(12205, 2, 2377.23,-5904.07,11.067, 'Spitelash Witch'), +(12205, 3, 2378.04,-5915.15,10.7378, 'Spitelash Witch'), +(12205, 4, 2374.96,-5932,9.66682, 'Spitelash Witch'), +(12205, 5, 2374.06,-5963.62,9.89577, 'Spitelash Witch'); + +-- Spitelash Raider SAI +SET @ENTRY := 12204; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,8,0,100,0,118,0,8000,8000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Spitelash Raider - On Spellhit 'Polymorph' - Run Script"), +(@ENTRY,0,1,0,8,0,100,0,12824,0,8000,8000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Spitelash Raider - On Spellhit 'Polymorph' - Run Script"), +(@ENTRY,0,2,0,8,0,100,0,12825,0,8000,8000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Spitelash Raider - On Spellhit 'Polymorph' - Run Script"), +(@ENTRY,0,3,0,8,0,100,0,12826,0,8000,8000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Spitelash Raider - On Spellhit 'Polymorph' - Run Script"), +(@ENTRY,0,4,0,54,0,100,0,0,0,0,0,53,1,12204,0,0,0,2,1,0,0,0,0,0,0,0,"Spitelash Raider - On Just Summoned - Start Waypoint"), +(@ENTRY,0,5,0,0,0,100,0,40,1000,6500,9000,11,12545,0,0,0,0,0,2,0,0,0,0,0,0,0,"Spitelash Raider - In Combat - Cast 'Spitelash'"), +(@ENTRY,0,6,0,0,0,100,0,1000,2500,11000,15000,11,12548,0,0,0,0,0,2,0,0,0,0,0,0,0,"Spitelash Raider - In Combat - Cast 'Frost Shock'"); + +DELETE FROM `waypoints` WHERE `entry`=12204; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(12204, 1, 2370.83,-5893.06,10.6607, 'Spitelash Raider'), +(12204, 2, 2379.97,-5904.9,10.7712, 'Spitelash Raider'), +(12204, 3, 2376.15,-5924.8,9.84824, 'Spitelash Raider'), +(12204, 4, 2373.41,-5962.79,9.70075, 'Spitelash Raider'); + +-- Actionlist SAI +SET @ENTRY := 1220500; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,11,29124,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Polymorph'"), +(@ENTRY,9,1,0,0,0,100,0,5000,5000,0,0,11,28406,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Polymorph Backfire'"), +(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,11,6924,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Remove Polymorph'"), +(@ENTRY,9,3,0,0,0,100,0,1000,1000,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Despawn Instant"); + +-- Actionlist SAI +SET @ENTRY := 838000; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Script - Set Active On"), +(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Script - Say Line 0"), +(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,9,0,0,50,0,0,0,0,"Captain Vanessa Beltis - On Script - Set Data 1 1"), +-- 1. wave +(@ENTRY,9,3,0,0,0,100,0,4000,4000,0,0,12,12205,6,300000,0,0,0,8,0,0,0,2370.83,-5893.06,-5893.06,5.45564,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Witch'"), +(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2367.58,-5889.81,11.3931,5.36209,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,5,0,0,0,100,0,0,0,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2369.53,-5888.84,11.2888,5.23643,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2366.15,-5891.65,11.72,5.46812,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +-- 2nd wave +(@ENTRY,9,7,0,0,0,100,0,50000,50000,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2370.83,-5893.06,10.6607,5.45564,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,8,0,0,0,100,0,1000,1000,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2367.58,-5889.81,11.3931,5.36209,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,9,0,0,0,100,0,0,0,0,0,12,12205,6,300000,0,0,0,8,0,0,0,2369.53,-5888.84,11.2888,5.23643,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Witch'"), +(@ENTRY,9,10,0,0,0,100,0,1000,1000,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2366.15,-5891.65,11.72,5.46812,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +-- 3. wave +(@ENTRY,9,11,0,0,0,100,0,52000,52000,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2370.83,-5893.06,10.6607,5.45564,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,12,0,0,0,100,0,1000,1000,0,0,12,12205,6,300000,0,0,0,8,0,0,0,2367.58,-5889.81,11.3931,5.36209,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Witch'"), +(@ENTRY,9,13,0,0,0,100,0,0,0,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2369.53,-5888.84,11.2888,5.23643,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,14,0,0,0,100,0,0,0,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2366.15,-5891.65,11.72,5.46812,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +-- 4. wave +(@ENTRY,9,15,0,0,0,100,0,54000,54000,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2370.83,-5893.06,10.6607,5.45564,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,16,0,0,0,100,0,1000,1000,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2367.58,-5889.81,11.3931,5.36209,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,17,0,0,0,100,0,0,0,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2369.53,-5888.84,11.2888,5.23643,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,18,0,0,0,100,0,0,0,0,0,12,12205,6,300000,0,0,0,8,0,0,0,2366.15,-5891.65,11.72,5.46812,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Witch'"), +-- 5. wave +(@ENTRY,9,19,0,0,0,100,0,55000,55000,0,0,12,12205,6,300000,0,0,0,8,0,0,0,2370.83,-5893.06,10.6607,5.45564,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Witch'"), +(@ENTRY,9,20,0,0,0,100,0,1000,1000,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2367.58,-5889.81,11.3931,5.36209,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,21,0,0,0,100,0,0,0,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2369.53,-5888.84,11.2888,5.23643,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,22,0,0,0,100,0,0,0,0,0,12,12205,6,300000,0,0,0,8,0,0,0,2366.15,-5891.65,11.72,5.46812,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Witch'"), +-- 6. wave +(@ENTRY,9,23,0,0,0,100,0,55000,55000,0,0,12,12205,6,300000,0,0,0,8,0,0,0,2370.83,-5893.06,10.6607,5.45564,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Witch'"), +(@ENTRY,9,24,0,0,0,100,0,1000,1000,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2367.58,-5889.81,11.3931,5.36209,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,25,0,0,0,100,0,0,0,0,0,12,12204,6,300000,0,0,0,8,0,0,0,2369.53,-5888.84,11.2888,5.23643,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Raider'"), +(@ENTRY,9,26,0,0,0,100,0,0,0,0,0,12,12205,6,300000,0,0,0,8,0,0,0,2366.15,-5891.65,11.72,5.46812,"Captain Vanessa Beltis - On Script - Summon Creature 'Spitelash Witch'"), +(@ENTRY,9,27,0,0,0,100,0,10000,10000,0,0,15,3382,0,0,0,0,0,17,0,30,0,0,0,0,0,"Captain Vanessa Beltis - On Script - Quest Credit 'A Crew Under Fire'"), +(@ENTRY,9,28,0,0,0,100,0,0,0,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Script - Set Active Off"), +(@ENTRY,9,29,0,0,0,100,0,0,0,0,0,45,2,2,0,0,0,0,9,0,0,50,0,0,0,0,"Captain Vanessa Beltis - On Script - Set Data 2 2"), +(@ENTRY,9,30,0,0,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Script - Set Faction 35"), +(@ENTRY,9,31,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captain Vanessa Beltis - On Script - set NPC-Flag"); + +DELETE FROM `creature_text` WHERE `entry`=8380; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextId`) VALUES +(8380, 0, 0, 'Stand Prepared! The naga won\'t wait long to press their advantage once they know we\'re alive.', 12, 0, 100, 0, 0, 0, 'Captain Vanessa Beltis', 4658); + +-- Lindros SAI +SET @ENTRY := 8381; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lindros - On Data Set 1 1 - Set Faction 250"), +(@ENTRY,0,1,0,38,0,100,0,2,2,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lindros - On Data Set 2 2 - Set Faction 35"), +(@ENTRY,0,2,0,4,0,100,0,0,0,0,0,11,11975,0,0,0,0,0,2,0,0,0,0,0,0,0,"Lindros - On Aggro - Cast 'Arcane Explosion'"), +(@ENTRY,0,3,0,0,0,100,0,1000,4000,3000,4000,11,20823,0,0,0,0,0,2,0,0,0,0,0,0,0,"Lindros - In Combat - Cast 'Fireball'"); + +-- Alexandra Blazen SAI +SET @ENTRY := 8378; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,"Alexandra Blazen - On Data Set 1 1 - Set Faction 250"), +(@ENTRY,0,1,0,38,0,100,0,2,2,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Alexandra Blazen - On Data Set 2 2 - Set Faction 35"), +(@ENTRY,0,2,0,4,0,100,0,0,0,0,0,11,1006,2,0,0,0,0,1,0,0,0,0,0,0,0,"Alexandra Blazen - On Aggro - Cast 'Inner Fire'"), +(@ENTRY,0,3,0,2,0,100,0,0,0,20000,20000,11,11640,0,0,0,0,0,1,0,0,0,0,0,0,0,"Alexandra Blazen - Between 0-0% Health - Cast 'Renew'"); + +-- Patrick Mills SAI +SET @ENTRY := 8382; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,"Patrick Mills - On Data Set 1 1 - Set Faction 250"), +(@ENTRY,0,1,0,38,0,100,0,2,2,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Patrick Mills - On Data Set 2 2 - Set Faction 35"), +(@ENTRY,0,2,0,4,0,100,0,0,0,0,0,11,1032,2,0,0,0,0,1,0,0,0,0,0,0,0,"Patrick Mills - On Aggro - Cast 'Devotion Aura'"), +(@ENTRY,0,3,0,0,0,100,0,2000,2000,4000,4000,11,17143,0,0,0,0,0,2,0,0,0,0,0,0,0,"Patrick Mills - In Combat - Cast 'Holy Strike'"); + +-- Horizon Scout Crewman SAI +SET @ENTRY := 8386; +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,"Horizon Scout Crewman - On Data Set 1 1 - Set Faction 250"), +(@ENTRY,0,1,0,38,0,100,0,2,2,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Horizon Scout Crewman - On Data Set 2 2 - Set Faction 35"), +(@ENTRY,0,2,0,0,0,100,0,2000,2000,4000,4000,11,6660,2,0,0,0,0,2,0,0,0,0,0,0,0,"Horizon Scout Crewman - In Combat - Cast 'Shoot'"); From 0ebc15e6f48b4c7bfa4355121f69d1999b125e2b Mon Sep 17 00:00:00 2001 From: Nayd Date: Sun, 15 Mar 2015 15:49:30 +0000 Subject: [PATCH 21/26] Core/DBLayer: Remove references to table character_currency (6.x only) Ref 170bc318b34d393ea08e1607b6a4de87fcb2e6d7 --- src/server/game/Entities/Player/Player.cpp | 4 ---- .../shared/Database/Implementation/CharacterDatabase.cpp | 1 - src/server/shared/Database/Implementation/CharacterDatabase.h | 1 - 3 files changed, 6 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index b0aa4775e1..285c737313 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4846,10 +4846,6 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe stmt->setUInt32(0, guid); trans->Append(stmt); - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_CURRENCY); - stmt->setUInt32(0, guid); - trans->Append(stmt); - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_GIFT); stmt->setUInt32(0, guid); trans->Append(stmt); diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 3a539cb6b3..c8632b8a3c 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -249,7 +249,6 @@ void CharacterDatabaseConnection::DoPrepareStatements() // Auras PrepareStatement(CHAR_INS_AURA, "INSERT INTO character_aura (guid, caster_guid, item_guid, spell, effect_mask, recalculate_mask, stackcount, amount0, amount1, amount2, base_amount0, base_amount1, base_amount2, maxduration, remaintime, remaincharges) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC); - PrepareStatement(CHAR_DEL_PLAYER_CURRENCY, "DELETE FROM character_currency WHERE CharacterGuid = ?", CONNECTION_ASYNC); // Account data PrepareStatement(CHAR_SEL_ACCOUNT_DATA, "SELECT type, time, data FROM account_data WHERE accountId = ?", CONNECTION_SYNCH); diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h index d2e35f92f3..e56a24d686 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.h +++ b/src/server/shared/Database/Implementation/CharacterDatabase.h @@ -222,7 +222,6 @@ enum CharacterDatabaseStatements CHAR_DEL_EQUIP_SET, CHAR_INS_AURA, - CHAR_DEL_PLAYER_CURRENCY, CHAR_SEL_ACCOUNT_DATA, CHAR_REP_ACCOUNT_DATA, From 7c8f7f6f8fc7fbc76a329c70980b09b9b3ada5ef Mon Sep 17 00:00:00 2001 From: click Date: Sun, 15 Mar 2015 21:04:51 +0100 Subject: [PATCH 22/26] Core/AHBot: Remove a lingering warning that annoyed me for all too long --- src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp index bd5defe2bc..6446394857 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp +++ b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp @@ -64,7 +64,7 @@ void AuctionBotBuyer::LoadConfig() } } -void AuctionBotBuyer::LoadBuyerValues(BuyerConfiguration& config) +void AuctionBotBuyer::LoadBuyerValues(BuyerConfiguration& /* config */) { } From fc973e4a1cddbf31c777b67774d04e583b2a9508 Mon Sep 17 00:00:00 2001 From: Rushor Date: Sun, 15 Mar 2015 21:27:31 +0100 Subject: [PATCH 23/26] DB/Creature: Kurenai Captive closes #6702 --- sql/updates/world/2015_03_15_14_world.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2015_03_15_14_world.sql diff --git a/sql/updates/world/2015_03_15_14_world.sql b/sql/updates/world/2015_03_15_14_world.sql new file mode 100644 index 0000000000..a74f3f6755 --- /dev/null +++ b/sql/updates/world/2015_03_15_14_world.sql @@ -0,0 +1,8 @@ +-- +DELETE FROM `creature_text` WHERE `entry`=18209; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(18209, 0, 0, 'It''s an ambush! Defend yourself!', 12, 0, 100, 0, 0, 0, 15044, 0, 'Kurenai Captive'), +(18209, 1, 0, 'More of them coming! Watch out!', 12, 0, 100, 0, 0, 0, 15000, 0, 'Kurenai Captive'), +(18209, 2, 0, 'Ride the lightning, filth!', 12, 1, 100, 0, 0, 0, 15006, 0, 'Kurenai Captive'), +(18209, 3, 0, 'We are surrounded!', 14, 0, 100, 0, 0, 0, 15047, 0, 'Kurenai Captive'), +(18209, 4, 0, 'Up ahead is the road to Telaar. We will split up when we reach the fork as they will surely send more Murkblood after us. Hopefully one of us makes it back to Telaar alive.', 14, 7, 100, 0, 0, 0, 15048, 0, 'Kurenai Captive'); From d3a20809eb918c0488c393e6d07af97549be8fa9 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 16 Mar 2015 08:13:28 +0100 Subject: [PATCH 24/26] DB/Misc: Fix startup errors By Killyana, updates #13707 --- sql/updates/world/2015_03_16_00_world.sql | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sql/updates/world/2015_03_16_00_world.sql diff --git a/sql/updates/world/2015_03_16_00_world.sql b/sql/updates/world/2015_03_16_00_world.sql new file mode 100644 index 0000000000..9fc5a43561 --- /dev/null +++ b/sql/updates/world/2015_03_16_00_world.sql @@ -0,0 +1,20 @@ +-- Portal Kruul SAI +SET @ENTRY := 184289; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,11,34386,0,0,0,0,0,19,19652,10,0,0,0,0,0,"Portal Kruul - On Gameobject State Changed - Cast spell 'Hellfire Fire'"); +-- Portal Xilus SAI +SET @ENTRY := 184290; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,11,34386,0,0,0,0,0,19,19717,10,0,0,0,0,0,"Portal Xilus - On Gameobject State Changed - Cast spell 'Hellfire Fire'"); +-- Portal Grimh SAI +SET @ENTRY := 184414; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,11,34386,0,0,0,0,0,19,19652,10,0,0,0,0,0,"Portal Grimh - On Gameobject State Changed - Cast spell 'Hellfire Fire'"); +-- Portal Kaalez SAI +SET @ENTRY := 184415; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,11,34386,0,0,0,0,0,19,19717,10,0,0,0,0,0,"Portal Kaalez - On Gameobject State Changed - Cast spell 'Hellfire Fire'"); From c941133bd2f664a8a451ccd81b1a8fab573a405a Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 16 Mar 2015 09:05:29 +0100 Subject: [PATCH 25/26] DB/Creature: Fix faction of 8564 Ranger --- sql/updates/world/2015_03_16_01_world_335.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2015_03_16_01_world_335.sql diff --git a/sql/updates/world/2015_03_16_01_world_335.sql b/sql/updates/world/2015_03_16_01_world_335.sql new file mode 100644 index 0000000000..2a0886c6ec --- /dev/null +++ b/sql/updates/world/2015_03_16_01_world_335.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `faction` = 1576 WHERE `entry` = 8564; From d3ad87b1cf48222aef5cbbc1f00cf2babadce111 Mon Sep 17 00:00:00 2001 From: joschiwald Date: Mon, 16 Mar 2015 14:18:31 +0100 Subject: [PATCH 26/26] Core: silence broadcasttext startup errors --- src/server/game/Globals/ObjectMgr.cpp | 33 ++++++++++----------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 2a421a45ec..f74201fee6 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -8601,7 +8601,6 @@ void ObjectMgr::LoadBroadcastTexts() } _broadcastTextStore.rehash(result->GetRowCount()); - uint32 count = 0; do { @@ -8627,26 +8626,23 @@ void ObjectMgr::LoadBroadcastTexts() { if (!sSoundEntriesStore.LookupEntry(bct.SoundId)) { - TC_LOG_INFO("sql.sql", "BroadcastText (Id: %u) in table `broadcast_text` has SoundId %u but sound does not exist. Skipped.", bct.Id, bct.SoundId); - // don't load bct of higher expansions - continue; + TC_LOG_DEBUG("broadcasttext", "BroadcastText (Id: %u) in table `broadcast_text` has SoundId %u but sound does not exist.", bct.Id, bct.SoundId); + bct.SoundId = 0; } } if (!GetLanguageDescByID(bct.Language)) { - TC_LOG_ERROR("sql.sql", "BroadcastText (Id: %u) in table `broadcast_text` using Language %u but Language does not exist. Skipped.", bct.Id, bct.Language); - // don't load bct of higher expansions - continue; + TC_LOG_DEBUG("broadcasttext", "BroadcastText (Id: %u) in table `broadcast_text` using Language %u but Language does not exist.", bct.Id, bct.Language); + bct.Language = LANG_UNIVERSAL; } if (bct.EmoteId0) { if (!sEmotesStore.LookupEntry(bct.EmoteId0)) { - TC_LOG_ERROR("sql.sql", "BroadcastText (Id: %u) in table `broadcast_text` has EmoteId0 %u but emote does not exist. Skipped.", bct.Id, bct.EmoteId0); - // don't load bct of higher expansions - continue; + TC_LOG_DEBUG("broadcasttext", "BroadcastText (Id: %u) in table `broadcast_text` has EmoteId0 %u but emote does not exist.", bct.Id, bct.EmoteId0); + bct.EmoteId0 = 0; } } @@ -8654,9 +8650,8 @@ void ObjectMgr::LoadBroadcastTexts() { if (!sEmotesStore.LookupEntry(bct.EmoteId1)) { - TC_LOG_ERROR("sql.sql", "BroadcastText (Id: %u) in table `broadcast_text` has EmoteId1 %u but emote does not exist. Skipped.", bct.Id, bct.EmoteId1); - // don't load bct of higher expansions - continue; + TC_LOG_DEBUG("broadcasttext", "BroadcastText (Id: %u) in table `broadcast_text` has EmoteId1 %u but emote does not exist.", bct.Id, bct.EmoteId1); + bct.EmoteId1 = 0; } } @@ -8664,19 +8659,16 @@ void ObjectMgr::LoadBroadcastTexts() { if (!sEmotesStore.LookupEntry(bct.EmoteId2)) { - TC_LOG_ERROR("sql.sql", "BroadcastText (Id: %u) in table `broadcast_text` has EmoteId2 %u but emote does not exist. Skipped.", bct.Id, bct.EmoteId2); - // don't load bct of higher expansions - continue; + TC_LOG_DEBUG("broadcasttext", "BroadcastText (Id: %u) in table `broadcast_text` has EmoteId2 %u but emote does not exist.", bct.Id, bct.EmoteId2); + bct.EmoteId2 = 0; } } _broadcastTextStore[bct.Id] = bct; - - ++count; } while (result->NextRow()); - TC_LOG_INFO("server.loading", ">> Loaded %u broadcast texts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + TC_LOG_INFO("server.loading", ">> Loaded " SZFMTD " broadcast texts in %u ms", _broadcastTextStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadBroadcastTextLocales() @@ -8702,8 +8694,7 @@ void ObjectMgr::LoadBroadcastTextLocales() BroadcastTextContainer::iterator bct = _broadcastTextStore.find(id); if (bct == _broadcastTextStore.end()) { - TC_LOG_INFO("sql.sql", "BroadcastText (Id: %u) in table `locales_broadcast_text` does not exist or is incompatible. Skipped!", id); - // don't load bct of higher expansions + TC_LOG_ERROR("sql.sql", "BroadcastText (Id: %u) in table `locales_broadcast_text` does not exist. Skipped!", id); continue; }