From ef0ebe38d0d665317955b1650d355dceb1058d4d Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Wed, 17 Apr 2024 03:12:20 -0300 Subject: [PATCH 01/20] fix(Scripts/Pet): Fix crash when spawning lightwell by hand (#18660) Co-authored-by: Pagani Walter --- src/server/scripts/Pet/pet_priest.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/server/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp index 88bcfc05a..41a77a49e 100644 --- a/src/server/scripts/Pet/pet_priest.cpp +++ b/src/server/scripts/Pet/pet_priest.cpp @@ -40,12 +40,15 @@ struct npc_pet_pri_lightwell : public TotemAI void InitializeAI() override { - if (Unit* owner = me->ToTempSummon()->GetSummonerUnit()) + if (TempSummon* tempSummon = me->ToTempSummon()) { - uint32 hp = uint32(owner->GetMaxHealth() * 0.3f); - me->SetMaxHealth(hp); - me->SetHealth(hp); - me->SetLevel(owner->GetLevel()); + if (Unit* owner = tempSummon->GetSummonerUnit()) + { + uint32 hp = uint32(owner->GetMaxHealth() * 0.3f); + me->SetMaxHealth(hp); + me->SetHealth(hp); + me->SetLevel(owner->GetLevel()); + } } me->CastSpell(me, SPELL_PRIEST_LIGHTWELL_CHARGES, false); // Spell for Lightwell Charges From 53864433888c2b827399b4db8b27ebb9b82c26f3 Mon Sep 17 00:00:00 2001 From: Anton Popovichenko Date: Wed, 17 Apr 2024 08:53:43 +0200 Subject: [PATCH 02/20] fix(Core/Characters): Fix crash on characters deletion with COD mails. (#18754) fix(Core/Characters): Fix crash on characters deletion. --- .../database/Database/Implementation/CharacterDatabase.cpp | 2 +- src/server/game/Handlers/CharacterHandler.cpp | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp index b77fdb2ce..c3794fef4 100644 --- a/src/server/database/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/database/Database/Implementation/CharacterDatabase.cpp @@ -115,7 +115,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() // End LoginQueryHolder content PrepareStatement(CHAR_SEL_CHARACTER_ACTIONS_SPEC, "SELECT button, action, type FROM character_action WHERE guid = ? AND spec = ? ORDER BY button", CONNECTION_ASYNC); - PrepareStatement(CHAR_SEL_MAILITEMS, "SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyId, durability, playedTime, text, item_guid, itemEntry, ii.owner_guid, m.id FROM mail_items mi INNER JOIN mail m ON mi.mail_id = m.id LEFT JOIN item_instance ii ON mi.item_guid = ii.guid WHERE m.receiver = ?", CONNECTION_ASYNC); + PrepareStatement(CHAR_SEL_MAILITEMS, "SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyId, durability, playedTime, text, item_guid, itemEntry, ii.owner_guid, m.id FROM mail_items mi INNER JOIN mail m ON mi.mail_id = m.id LEFT JOIN item_instance ii ON mi.item_guid = ii.guid WHERE m.receiver = ?", CONNECTION_BOTH); PrepareStatement(CHAR_SEL_AUCTION_ITEMS, "SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyId, durability, playedTime, text, itemguid, itemEntry FROM auctionhouse ah JOIN item_instance ii ON ah.itemguid = ii.guid", CONNECTION_SYNCH); PrepareStatement(CHAR_SEL_AUCTIONS, "SELECT id, houseid, itemguid, itemEntry, count, itemowner, buyoutprice, time, buyguid, lastbid, startbid, deposit FROM auctionhouse ah INNER JOIN item_instance ii ON ii.guid = ah.itemguid", CONNECTION_SYNCH); PrepareStatement(CHAR_INS_AUCTION, "INSERT INTO auctionhouse (id, houseid, itemguid, itemowner, buyoutprice, time, buyguid, lastbid, startbid, deposit) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC); diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index e08e4f828..1c0080b6e 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -640,13 +640,6 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData) accountId = playerData->AccountId; name = playerData->Name; level = playerData->Level; - - // check mailbox - if (playerData->MailCount) - { - SendCharDelete(CHAR_DELETE_FAILED); - return; - } } // prevent deleting other players' characters using cheating tools From 6f154d0a6baa819645b497f52c0fc6c514825341 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 18 Apr 2024 10:31:41 -0300 Subject: [PATCH 03/20] feat(Core/SmartAI): Add support for waypoint_data in SAI (#18706) * Create rev_1712670662273633900.sql * eol? * doesn't like a comment at the end, ok, ok * init * mack * Update SmartScript.cpp * kurzel * random paths and garg * Update rev_1712889530436412200.sql * brend & marge * Update rev_1712889530436412200.sql * movement actions * Update SmartScriptMgr.h --- .../rev_1712889530436412200.sql | 689 ++++++++++++++++++ src/server/game/AI/SmartScripts/SmartAI.cpp | 8 + src/server/game/AI/SmartScripts/SmartAI.h | 2 + .../game/AI/SmartScripts/SmartScript.cpp | 65 ++ .../game/AI/SmartScripts/SmartScriptMgr.cpp | 14 + .../game/AI/SmartScripts/SmartScriptMgr.h | 37 +- 6 files changed, 813 insertions(+), 2 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1712889530436412200.sql diff --git a/data/sql/updates/pending_db_world/rev_1712889530436412200.sql b/data/sql/updates/pending_db_world/rev_1712889530436412200.sql new file mode 100644 index 000000000..20d6123ea --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1712889530436412200.sql @@ -0,0 +1,689 @@ +-- +SET @CGUID := 139263; +SET @OGUID := 100514; + +DELETE FROM `creature` WHERE `map` = 530 AND `id1` IN (23559, 23560, 23565, 23705, 23716, 23718, 23724, 23745, 23746, 23747, 23748, 23761, 23762, 23764, 23766, 23858, 24851, 25145); +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES +(@CGUID+0 , 23559, 530, 3433, 3508, 0, 6774.67, -7608.4, 128.699, 4.67748, 120, 0, 0, 53788, 1, NULL), +(@CGUID+1 , 23560, 530, 3433, 3507, 1, 6737, -7611.17, 125.946, 0.174533, 120, 0, 0, 53788, 1, 'SAI Target'), +(@CGUID+2 , 23565, 530, 3433, 3517, 0, 6797.45, -7537.86, 126.264, 3.35103, 120, 0, 0, 53788, 1, NULL), +(@CGUID+3 , 23705, 530, 3433, 3508, 1, 6770.6, -7614.27, 128.68, 5.75959, 120, 0, 0, 53788, 1, NULL), +(@CGUID+4 , 23705, 530, 3433, 3508, 1, 6761.84, -7667.97, 126.544, 2.35619, 120, 0, 0, 53788, 1, NULL), +(@CGUID+5 , 23705, 530, 3433, 3507, 1, 6745.69, -7636.87, 127.306, 5.84685, 120, 0, 0, 53788, 1, NULL), +(@CGUID+6 , 23705, 530, 3433, 3507, 1, 6772.59, -7553.14, 127.129, 3.87463, 120, 0, 0, 53788, 1, NULL), +(@CGUID+7 , 23705, 530, 3433, 3507, 1, 6729.76, -7549.41, 130.142, 2.18166, 120, 0, 0, 53788, 1, NULL), +(@CGUID+8 , 23716, 530, 3433, 3508, 1, 6782.92, -7642.17, 127.904, 2.77507, 120, 0, 0, 53788, 1, NULL), +(@CGUID+9 , 23716, 530, 3433, 3507, 1, 6737.85, -7577.82, 126.802, 0.942478, 120, 0, 0, 53788, 1, NULL), +(@CGUID+10, 23718, 530, 3433, 3507, 0, 6743.72, -7553.35, 126.19, 3.1765, 120, 0, 0, 53788, 1, 'GUID SAI'), +(@CGUID+11, 23724, 530, 3433, 3507, 1, 6742.99, -7615.56, 126.164, 2.56007, 120, 0, 0, 53788, 1, NULL), +(@CGUID+12, 23745, 530, 3433, 3508, 1, 6774.4, -7640.2, 127.616, 1.3374, 120, 0, 0, 53788, 1, 'GUID SAI'), +(@CGUID+13, 23746, 530, 3433, 3517, 0, 6743.56, -7532.4, 136.939, 2.60054, 120, 0, 0, 53788, 1, NULL), +(@CGUID+14, 23746, 530, 3433, 3517, 0, 6733.52, -7507.14, 135.088, 1.81514, 120, 0, 0, 53788, 1, NULL), +(@CGUID+15, 23746, 530, 3433, 3517, 0, 6743.83, -7522.06, 136.811, 3.7001, 120, 0, 0, 53788, 1, NULL), +(@CGUID+16, 23746, 530, 3433, 3517, 0, 6753.8, -7541.53, 126.229, 0.942478, 120, 0, 0, 53788, 1, NULL), +(@CGUID+17, 23746, 530, 3433, 3517, 0, 6761.36, -7557.16, 126.312, 4.15388, 120, 0, 0, 53788, 1, NULL), +(@CGUID+18, 23746, 530, 3433, 3517, 0, 6753.51, -7533.31, 127.201, 1.71042, 120, 0, 0, 53788, 1, NULL), +(@CGUID+19, 23746, 530, 3433, 3517, 0, 6756.32, -7550.76, 126.23, 3.42085, 120, 0, 0, 53788, 1, NULL), +(@CGUID+20, 23746, 530, 3433, 3517, 0, 6757.07, -7519.97, 127.057, 4.97419, 120, 0, 0, 53788, 1, NULL), +(@CGUID+21, 23746, 530, 3433, 3517, 0, 6745.09, -7510.54, 130.061, 2.00713, 120, 0, 0, 53788, 1, NULL), +(@CGUID+22, 23746, 530, 3433, 3517, 0, 6740.8, -7517.56, 137.634, 1.72788, 120, 0, 0, 53788, 1, NULL), +(@CGUID+23, 23746, 530, 3433, 3517, 0, 6763.38, -7548.29, 126.205, 5.20108, 120, 0, 0, 53788, 1, NULL), +(@CGUID+24, 23746, 530, 3433, 3517, 0, 6751.23, -7520.55, 130.214, 1.44862, 120, 0, 0, 53788, 1, NULL), +(@CGUID+25, 23746, 530, 3433, 3517, 0, 6743.7, -7546.71, 130.952, 1.09956, 120, 0, 0, 53788, 1, NULL), +(@CGUID+26, 23746, 530, 3433, 3517, 0, 6737.25, -7542.65, 136.438, 5.61996, 120, 0, 0, 53788, 1, NULL), +(@CGUID+27, 23746, 530, 3433, 3517, 0, 6730.89, -7531.32, 150.091, 6.07375, 120, 0, 0, 53788, 1, NULL), +(@CGUID+28, 23746, 530, 3433, 3517, 0, 6729.94, -7528.34, 156.399, 5.74213, 120, 0, 0, 53788, 1, NULL), +(@CGUID+29, 23746, 530, 3433, 3517, 0, 6738.28, -7537.18, 139.049, 5.68977, 120, 0, 0, 53788, 1, 'SAI Target'), +(@CGUID+30, 23746, 530, 3433, 3517, 0, 6751.98, -7555.14, 126.243, 6.10865, 120, 0, 0, 53788, 1, NULL), +(@CGUID+31, 23746, 530, 3433, 3517, 0, 6738.07, -7528.8, 143.086, 4.24115, 120, 0, 0, 53788, 1, NULL), +(@CGUID+32, 23746, 530, 3433, 3517, 0, 6744.29, -7538.55, 140.056, 5.28835, 120, 0, 0, 53788, 1, NULL), +(@CGUID+33, 23746, 530, 3433, 3517, 0, 6731.42, -7530.94, 150.013, 0.0872665, 120, 0, 0, 53788, 1, NULL), +(@CGUID+34, 23746, 530, 3433, 3517, 0, 6733.69, -7525.79, 149, 4.5204, 120, 0, 0, 53788, 1, NULL), +(@CGUID+35, 23746, 530, 3433, 3517, 0, 6730.87, -7533.37, 148.853, 4.88692, 120, 0, 0, 53788, 1, NULL), +(@CGUID+36, 23746, 530, 3433, 3517, 0, 6749.51, -7544.93, 128.156, 3.26377, 120, 0, 0, 53788, 1, NULL), +(@CGUID+37, 23746, 530, 3433, 3517, 0, 6731.82, -7530.35, 150.132, 4.72984, 120, 0, 0, 53788, 1, NULL), +(@CGUID+38, 23746, 530, 3433, 3517, 0, 6750.13, -7556.32, 126.232, 5.18363, 120, 0, 0, 53788, 1, NULL), +(@CGUID+39, 23746, 530, 3433, 3517, 0, 6733.28, -7528.4, 149.419, 2.05949, 120, 0, 0, 53788, 1, NULL), +(@CGUID+40, 23746, 530, 3433, 3517, 0, 6733.18, -7524.16, 149.411, 6.05629, 120, 0, 0, 53788, 1, NULL), +(@CGUID+41, 23746, 530, 3433, 3517, 0, 6762.9, -7566.96, 126.934, 5.96903, 120, 0, 0, 53788, 1, NULL), +(@CGUID+42, 23746, 530, 3433, 3517, 0, 6729.14, -7529.51, 157.446, 1.06465, 120, 0, 0, 53788, 1, NULL), +(@CGUID+43, 23746, 530, 3433, 3517, 0, 6723.32, -7534.91, 149.18, 1.36136, 120, 0, 0, 53788, 1, NULL), +(@CGUID+44, 23746, 530, 3433, 3517, 0, 6747.82, -7574.27, 127.372, 1.95477, 120, 0, 0, 53788, 1, NULL), +(@CGUID+45, 23746, 530, 3433, 3517, 0, 6736.1, -7547.67, 130.127, 2.37365, 120, 0, 0, 53788, 1, NULL), +(@CGUID+46, 23746, 530, 3433, 3517, 0, 6749.38, -7565.68, 126.488, 5.02655, 120, 0, 0, 53788, 1, NULL), +(@CGUID+47, 23746, 530, 3433, 3517, 0, 6736.17, -7557.46, 141.281, 1.98968, 120, 0, 0, 53788, 1, NULL), +(@CGUID+48, 23746, 530, 3433, 3517, 0, 6734.16, -7543.62, 136.616, 5.23599, 120, 0, 0, 53788, 1, NULL), +(@CGUID+49, 23746, 530, 3433, 3517, 0, 6723.14, -7545.02, 136.988, 4.59022, 120, 0, 0, 53788, 1, NULL), +(@CGUID+50, 23746, 530, 3433, 3517, 0, 6735.06, -7563.1, 127.515, 0.174533, 120, 0, 0, 53788, 1, NULL), +(@CGUID+51, 23746, 530, 3433, 3517, 0, 6729.54, -7541.35, 140.015, 4.57276, 120, 0, 0, 53788, 1, NULL), +(@CGUID+52, 23746, 530, 3433, 3517, 0, 6729.03, -7534.51, 149.191, 0.0872665, 120, 0, 0, 53788, 1, NULL), +(@CGUID+53, 23746, 530, 3433, 3517, 0, 6719.13, -7530.59, 149.696, 4.38078, 120, 0, 0, 53788, 1, NULL), +(@CGUID+54, 23746, 530, 3433, 3517, 0, 6743.28, -7565.82, 126.624, 3.63028, 120, 0, 0, 53788, 1, NULL), +(@CGUID+55, 23746, 530, 3433, 3517, 0, 6726.72, -7538.98, 143.007, 1.22173, 120, 0, 0, 53788, 1, NULL), +(@CGUID+56, 23746, 530, 3433, 3517, 0, 6728.03, -7547.98, 134.706, 4.11898, 120, 0, 0, 53788, 1, NULL), +(@CGUID+57, 23746, 530, 3433, 3517, 0, 6739.92, -7552.51, 126.553, 5.67232, 120, 0, 0, 53788, 1, NULL), +(@CGUID+58, 23746, 530, 3433, 3517, 0, 6737.62, -7570.73, 127.227, 1.0472, 120, 0, 0, 53788, 1, NULL), +(@CGUID+59, 23746, 530, 3433, 3517, 0, 6717.89, -7548.41, 130.347, 6.00393, 120, 0, 0, 53788, 1, NULL), +(@CGUID+60, 23746, 530, 3433, 3517, 0, 6720.03, -7550.59, 144.775, 6.21337, 120, 0, 0, 53788, 1, NULL), +(@CGUID+61, 23746, 530, 3433, 3517, 0, 6711.27, -7539.66, 136.643, 5.74213, 120, 0, 0, 53788, 1, NULL), +(@CGUID+62, 23746, 530, 3433, 3517, 0, 6710.25, -7548.35, 131.092, 2.6529, 120, 0, 0, 53788, 1, NULL), +(@CGUID+63, 23747, 530, 3433, 3507, 0, 6767.38, -7574.12, 127.04, 1.55334, 120, 0, 0, 53788, 1, NULL), +(@CGUID+64, 23747, 530, 3433, 3507, 0, 6771.96, -7556.53, 127.058, 1.37184, 120, 0, 0, 53788, 1, NULL), +(@CGUID+65, 23748, 530, 3433, 3517, 0, 6788.49, -7539.9, 126.109, 3.38594, 120, 0, 0, 53788, 1, 'GUID SAI'), +(@CGUID+66, 23761, 530, 3433, 3508, 1, 6769.81, -7616.67, 128.49, 0.697258, 120, 0, 0, 53788, 1, 'GUID SAI'), +(@CGUID+67, 23762, 530, 3433, 3507, 1, 6736.026, -7558.7544, 126.89935, 1.48352, 120, 0, 0, 53788, 1, 'GUID SAI, SAI Target'), +(@CGUID+68, 23764, 530, 3433, 3507, 1, 6740.1978, -7559.655, 126.451454, 1.972222, 120, 0, 0, 53788, 1, 'GUID SAI, SAI Target'), +(@CGUID+69, 23766, 530, 3433, 3507, 1, 6742.55, -7556.7, 126.212, 2.21112, 120, 0, 0, 53788, 1, 'GUID SAI'), +(@CGUID+70, 23858, 530, 3433, 3508, 1, 6764.49, -7610.38, 128.548, 5.41052, 120, 0, 0, 53788, 1, 'GUID SAI'), +(@CGUID+71, 24851, 530, 3433, 3508, 0, 6789.3, -7750.54, 126.815, 1.02974, 120, 0, 0, 53788, 1, NULL), +(@CGUID+72, 25145, 530, 3433, 3517, 1, 6793.5, -7555.5, 126.474, 3.71755, 120, 0, 0, 53788, 1, NULL), +(@CGUID+73, 25145, 530, 3433, 3517, 1, 6795.15, -7589.81, 127.622, 4.13643, 120, 0, 0, 53788, 1, NULL), +(@CGUID+74, 25145, 530, 3433, 3508, 1, 6786.62, -7619.71, 128.33, 6.17847, 120, 0, 0, 53788, 1, NULL), +(@CGUID+75, 25145, 530, 3433, 3508, 1, 6807.31, -7690.35, 130.621, 0.453786, 120, 0, 0, 53788, 1, NULL), +(@CGUID+76, 25145, 530, 3433, 3508, 1, 6779.61, -7651.7, 127.412, 5.14872, 120, 0, 0, 53788, 1, NULL), +(@CGUID+77, 25145, 530, 3433, 3508, 1, 6811.6, -7721, 125.959, 4.50295, 120, 0, 0, 53788, 1, NULL), +(@CGUID+78, 25145, 530, 3433, 3508, 1, 6770.12, -7687.2, 127.809, 0.500069, 120, 0, 0, 53788, 1, NULL), +(@CGUID+79, 25145, 530, 3433, 3508, 1, 6833.79, -7744.13, 124.765, 0.436332, 120, 0, 0, 53788, 1, NULL), +(@CGUID+80, 25145, 530, 3433, 3508, 1, 6871.87, -7751.06, 126.638, 2.07694, 120, 0, 0, 53788, 1, NULL), +(@CGUID+81, 25145, 530, 3433, 3508, 1, 6782.69, -7739.66, 126.344, 0.314159, 120, 0, 0, 53788, 1, NULL), +(@CGUID+82, 25145, 530, 3433, 3508, 1, 6838.43, -7786.18, 130.069, 1.53589, 120, 0, 0, 53788, 1, NULL), +(@CGUID+83, 25145, 530, 3433, 3508, 1, 6858.05, -7786.21, 130.118, 1.37881, 120, 0, 0, 53788, 1, NULL), +(@CGUID+84, 25145, 530, 3433, 3508, 1, 6813.94, -7772.28, 127.331, 6.23083, 120, 0, 0, 53788, 1, NULL), +(@CGUID+85, 25145, 530, 3433, 3508, 1, 6802.71, -7761.1, 126.991, 0.663225, 120, 0, 0, 53788, 1, NULL), +(@CGUID+86, 25145, 530, 3433, 3508, 1, 6815.57, -7795.29, 132.311, 1.09956, 120, 0, 0, 53788, 1, NULL), +(@CGUID+87, 25145, 530, 3433, 3508, 1, 6776.12, -7762.38, 128.772, 0.523599, 120, 0, 0, 53788, 1, NULL), +(@CGUID+88, 25145, 530, 3433, 3508, 1, 6835.44, -7798.48, 134.436, 2.18166, 120, 0, 0, 53788, 1, NULL), +(@CGUID+89, 25145, 530, 3433, 3508, 1, 6784.56, -7772.55, 142.828, 0.925025, 120, 0, 0, 53788, 1, NULL), +(@CGUID+90, 25145, 530, 3433, 3508, 1, 6764.31, -7791.43, 151.763, 1.58825, 120, 0, 0, 53788, 1, NULL), +(@CGUID+91, 25145, 530, 3433, 3507, 1, 6741.47, -7630.29, 126.71, 0.0523599, 120, 0, 0, 53788, 1, NULL), +(@CGUID+92, 25145, 530, 3433, 3507, 1, 6738.16, -7604.25, 126.653, 0.261799, 120, 0, 0, 53788, 1, NULL), +(@CGUID+93, 25145, 530, 3433, 3507, 1, 6728.52, -7572.14, 127.364, 0.401426, 120, 0, 0, 53788, 1, NULL), +(@CGUID+94, 25145, 530, 3433, 3507, 1, 6756.51, -7545.18, 126.2, 5.09636, 120, 0, 0, 53788, 1, NULL); + +DELETE FROM `gameobject` WHERE `map` = 530 AND `id` IN (184858, 184863, 186251, 186280, 186284, 186285, 186286, 186302, 186307); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`, `Comment`) VALUES +(@OGUID+0 , 186251, 530, 3433, 3508, 6820.08, -7781.74, 129.512, 3.94445, 0.00621271, -0.0257998, -0.920135, 0.3907, 120, 255, 1, 53788, NULL), +(@OGUID+1 , 184858, 530, 3433, 3517, 6786.55, -7541.54, 126.109, 1.72787, 0, 0, 0.760406, 0.649449, 120, 255, 1, 53788, NULL), +(@OGUID+2 , 184858, 530, 3433, 3517, 6784.78, -7538.15, 126.109, 2.14675, 0, 0, 0.878817, 0.47716, 120, 255, 1, 53788, NULL), +(@OGUID+3 , 184858, 530, 3433, 3508, 6779.51, -7581.32, 127.825, 6.17847, 0, 0, -0.0523357, 0.99863, 120, 255, 1, 53788, NULL), +(@OGUID+4 , 184863, 530, 3433, 3517, 6799.52, -7541.11, 126.285, 1.83259, 0, 0, 0.793353, 0.608762, 120, 255, 1, 53788, NULL), +(@OGUID+5 , 184863, 530, 3433, 3517, 6797.52, -7541.51, 126.193, 0.436332, 0, 0, 0.216439, 0.976296, 120, 255, 1, 53788, NULL), +(@OGUID+6 , 186280, 530, 3433, 3517, 6797.61, -7541.46, 127.133, 3.10665, 0, 0, 0.999847, 0.0174693, 120, 255, 1, 53788, NULL), +(@OGUID+7 , 186280, 530, 3433, 3517, 6801.36, -7539.01, 127.896, 2.30383, 0, 0, 0.913545, 0.406738, 120, 255, 1, 53788, NULL), +(@OGUID+8 , 186280, 530, 3433, 3517, 6795.77, -7542.83, 126.128, 6.12611, 0, 0, -0.0784588, 0.996917, 120, 255, 1, 53788, NULL), +(@OGUID+9 , 186280, 530, 3433, 3508, 6773.67, -7583.76, 128.447, 2.11185, 0, 0, 0.870356, 0.492424, 120, 255, 1, 53788, NULL), +(@OGUID+10, 186280, 530, 3433, 3508, 6773.77, -7584.46, 128.462, 1.93731, 0, 0, 0.824125, 0.566408, 120, 255, 1, 53788, NULL), +(@OGUID+11, 186280, 530, 3433, 3508, 6773.4, -7584.54, 128.457, 2.9845, 0, 0, 0.996917, 0.0784664, 120, 255, 1, 53788, NULL), +(@OGUID+12, 186280, 530, 3433, 3508, 6773.33, -7584.19, 128.458, 3.05433, 0, 0, 0.999048, 0.0436193, 120, 255, 1, 53788, NULL), +(@OGUID+13, 186280, 530, 3433, 3508, 6773.7, -7584.08, 128.443, 1.78023, 0, 0, 0.777145, 0.629321, 120, 255, 1, 53788, NULL), +(@OGUID+14, 186280, 530, 3433, 3508, 6773.27, -7583.85, 128.459, 0.0174525, 0, 0, 0.00872612, 0.999962, 120, 255, 1, 53788, NULL), +(@OGUID+15, 186280, 530, 3433, 3507, 6735.68, -7556.51, 126.664, 3.17653, 0, 0, -0.999847, 0.0174693, 120, 255, 1, 53788, NULL), +(@OGUID+16, 186280, 530, 3433, 3507, 6736.88, -7555.64, 126.613, 6.12611, 0, 0, -0.0784588, 0.996917, 120, 255, 1, 53788, NULL), +(@OGUID+17, 186280, 530, 3433, 3507, 6737.26, -7555.16, 126.591, 6.14356, 0, 0, -0.0697556, 0.997564, 120, 255, 1, 53788, NULL), +(@OGUID+18, 186280, 530, 3433, 3507, 6736.73, -7555.26, 126.607, 3.80482, 0, 0, -0.945518, 0.325568, 120, 255, 1, 53788, NULL), +(@OGUID+19, 186280, 530, 3433, 3507, 6737.19, -7555.53, 126.602, 4.55531, 0, 0, -0.760406, 0.649449, 120, 255, 1, 53788, NULL), +(@OGUID+20, 186284, 530, 3433, 3508, 6781.96, -7641.6, 127.324, 2.51327, 0, 0, 0.951056, 0.309017, 120, 255, 1, 53788, NULL), +(@OGUID+21, 186284, 530, 3433, 3508, 6771.65, -7615.08, 127.931, 3.73501, 0, 0, -0.956305, 0.292372, 120, 255, 1, 53788, NULL), +(@OGUID+22, 186284, 530, 3433, 3507, 6747.19, -7637.35, 126.625, 4.50295, 0, 0, -0.777145, 0.629321, 120, 255, 1, 53788, NULL), +(@OGUID+23, 186284, 530, 3433, 3507, 6738.87, -7577.17, 126.101, 0.331611, 0, 0, 0.165047, 0.986286, 120, 255, 1, 53788, NULL), +(@OGUID+24, 186284, 530, 3433, 3507, 6771.76, -7553.98, 126.278, 5.75959, 0, 0, -0.258819, 0.965926, 120, 255, 1, 53788, NULL), +(@OGUID+25, 186284, 530, 3433, 3507, 6730.02, -7547.91, 129.268, 1.98967, 0, 0, 0.83867, 0.54464, 120, 255, 1, 53788, NULL), +(@OGUID+26, 186285, 530, 3433, 3507, 6714.2, -7544.62, 130.047, 3.17653, 0, 0, -0.999847, 0.0174693, 120, 255, 1, 53788, NULL), +(@OGUID+27, 186285, 530, 3433, 3507, 6728.64, -7530.09, 158.158, 4.17134, 0, 0, -0.870356, 0.492424, 120, 255, 1, 53788, NULL), +(@OGUID+28, 186286, 530, 3433, 3507, 6723.6, -7542.17, 139.718, 1.88495, 0, 0, 0.809016, 0.587786, 120, 255, 1, 53788, NULL), +(@OGUID+29, 186286, 530, 3433, 3507, 6725.8, -7530.72, 129.99, 2.68781, 0, 0, 0.97437, 0.224951, 120, 255, 1, 53788, NULL), +(@OGUID+30, 186286, 530, 3433, 3507, 6743.65, -7520.94, 130.603, 2.32129, 0, 0, 0.91706, 0.39875, 120, 255, 1, 53788, NULL), +(@OGUID+31, 186302, 530, 3433, 3517, 6786.58, -7541.63, 126.109, 0.628317, 0, 0, 0.309016, 0.951057, 120, 255, 1, 53788, NULL), +(@OGUID+32, 186302, 530, 3433, 3508, 6779.59, -7581.29, 127.815, 0.95993, 0, 0, 0.461748, 0.887011, 120, 255, 1, 53788, NULL), +(@OGUID+33, 186302, 530, 3433, 3508, 6773.51, -7584.16, 128.391, 3.35105, 0, 0, -0.994521, 0.104536, 120, 255, 1, 53788, NULL), +(@OGUID+34, 186302, 530, 3433, 3507, 6737.07, -7555.36, 126.601, 1.8675, 0, 0, 0.803857, 0.594823, 120, 255, 1, 53788, NULL), +(@OGUID+35, 186307, 530, 3433, 3517, 6785.49, -7539.38, 126.901, 0.418879, 0, 0, 0.207911, 0.978148, 120, 255, 1, 53788, NULL), +(@OGUID+36, 186307, 530, 3433, 3517, 6785.73, -7539.49, 126.109, 4.71239, 0, 0, -0.707107, 0.707107, 120, 255, 1, 53788, NULL); + +DELETE FROM `creature_addon` WHERE `guid` IN (2070, 94484); +DELETE FROM `waypoint_data` WHERE `id` IN (20700, 944840); +DELETE FROM `waypoint_scripts` WHERE `id` IN (451, 452, 453, 454); + +DELETE FROM `creature_template_addon` WHERE `entry` IN (23705, 23716); +INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(23705, 0, 0, 7, 0, 0, 0, ''), +(23716, 0, 0, 7, 0, 0, 0, ''); + +DELETE FROM `creature_equip_template` WHERE `CreatureID` = 23761; +INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`, `VerifiedBuild`) VALUES +(23761, 1, 2558, 0, 0, 53788); + +DELETE FROM `creature_text` WHERE `CreatureID` IN (23718, 23560, 23748, 23764, 23762, 23766); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `BroadcastTextId`, `Text`, `Type`, `Emote`, `comment`) VALUES +(23718, 0, 0, 22204, 'Well, helllooo there, pretty thing...', 12, 2, 'Mack to Ameenah'), +(23718, 0, 1, 22215, 'Well now, what vision of loveliness is this?', 12, 2, 'Mack to Ameenah'), +(23718, 0, 2, 22216, 'Ahh, my precious Ameenah! How wonderful to see you again.', 12, 2, 'Mack to Ameenah'), +(23718, 1, 0, 22205, 'Playing hard to get today, I see.... Very well, perhaps I\'ll find you in a better mood later.', 12, 1, 'Mack to Ameenah'), +(23718, 1, 1, 22209, 'Whatever you say, princess. But yer simply postponing the inevitable....', 12, 1, 'Mack to Ameenah'), +(23718, 1, 2, 22210, 'Now why would ya wanna go an\' break poor Mack\'s heart? When I return, I\'ll pray ye\'ve changed yer way of thinkin\'....', 12, 1, 'Mack to Ameenah'), +(23718, 1, 3, 22211, 'Yer wearin down, princess. I can sense it!', 12, 1, 'Mack to Ameenah'), +(23718, 2, 0, 22206, 'Hmm, don\'t mind if I do!', 12, 0, 'Mack'), +(23718, 2, 1, 22218, 'Mmm, nuthin a little lubrication won\'t fix!', 12, 0, 'Mack'), +(23718, 2, 2, 22219, 'Never drink before 5 o\'clock, momma used to say. Well, momma, it\'s bound to be 5 o\'clock somewhere!', 12, 0, 'Mack'), +(23718, 2, 3, 22217, 'Hrmph. I never liked her anyway....', 12, 0, 'Mack'), +(23718, 3, 0, 22220, ' Ugh...', 12, 0, 'Mack'), +(23718, 3, 1, 22221, 'Whooo! Like daddy used to say, just makin room fer more! Heh.', 12, 0, 'Mack'), +(23718, 3, 2, 22222, 'Ooohh. Somethin\'s not agreein\' with the tummy today...', 12, 0, 'Mack'), +(23718, 4, 0, 22223, 'Hmmm, p\'rhaps I\'ll rest these old bones for a bit.', 12, 0, 'Mack'), +(23560, 0, 0, 22207, 'Not now, Mack. I be in no mood for your drunken pawing. Off with ya!', 12, 274, 'Ameenah to Mack'), +(23560, 0, 1, 22212, 'Beat it, Mack! Else I\'ll have Budd cook ya fer my hounds....', 12, 274, 'Ameenah to Mack'), +(23560, 0, 2, 22213, 'There be nuthin\' here to drink, Mack. Away with ya!', 12, 274, 'Ameenah to Mack'), +(23560, 0, 3, 22214, 'Go jump in the lake, won\'t ya Mack? I smelled ya before I saw ya....', 12, 274, 'Ameenah to Mack'), +(23748, 0, 0, 22252, 'Turgore! Get up and help me unload, you lazy peon!', 12, 60, 'Kurzel to Turgore'), +(23748, 1, 0, 22253, 'Useless orc! Just you wait, one day I\'ll drop somethin in yer grog that you\'ll NEVER wake up from....', 12, 0, 'Kurzel to Turgore'), +(23764, 0, 0, 22254, 'Say, Brend, why is it that you never make eyes at me?', 12, 396, 'Marge to Brend'), +(23764, 1, 0, 22265, 'Say, Brend, whisper me somethin\' sweet, will ya?', 12, 0, 'Marge to Brend'), +(23764, 3, 0, 22258, 'Oohhhh. How dare you!', 12, 5, 'Marge to Brend'), +(23764, 4, 0, 22259, 'Let that be a lesson to ya....', 12, 0, 'Marge to Brend'), +(23764, 2, 0, 22266, 'But Brend, yer always drinkin\'!', 12, 0, 'Marge to Brend'), +(23764, 5, 0, 22267, 'Filthy orc!', 12, 0, 'Marge to Morgom'), +(23762, 0, 0, 22255, 'Well, Marge, I\'ve actually been looking for a way to tell you this....', 12, 1, 'Brend to Marge'), +(23762, 1, 0, 22256, 'Try as I might, I can\'t seem to drink you pretty!', 12, 1, 'Brend to Marge'), +(23762, 2, 0, 22268, 'Lissen Marge, I thought I told ya never to bother me when I be drinkin\'....', 12, 396, 'Brend to Marge'), +(23762, 3, 0, 22269, 'Hey Morgom, looks like Margie here be needin\' some attention. What\'dya say?', 12, 0, 'Brend to Morgom'), +(23766, 0, 0, 22270, 'Zug Zug!', 12, 0, 'Morgom'); + +DELETE FROM `creature_addon` WHERE (`guid` = @CGUID+2); +INSERT INTO `creature_addon` (`guid`, `bytes1`, `bytes2`, `auras`) VALUES +(@CGUID+2, 3, 1, '32951'); + +-- Pathing for Budd's Bodyguard Entry: 25145 +SET @NPC := @CGUID+73; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,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,6795.15,-7589.807,127.6219,2.216568231582641601,60000,0,0,100,0), +(@PATH,2,6795.15,-7589.807,127.6219,3.141592741012573242,60000,0,0,100,0), +(@PATH,3,6795.15,-7589.807,127.6219,6.248278617858886718,60000,0,0,100,0), +(@PATH,4,6795.15,-7589.807,127.6219,4.136430263519287109,60000,0,0,100,0); +-- 0x20449C4240188E4000003A0002F9A064 .go xyz 6795.15 -7589.807 127.6219 + +-- Pathing for Budd's Bodyguard Entry: 25145 +SET @NPC := @CGUID+78; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=6787.902,`position_y`=-7683.4673,`position_z`=128.29967 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,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,6787.902,-7683.4673,128.29967,NULL,10000,0,0,100,0), +(@PATH,2,6770.124,-7687.202,127.80886,NULL,0,0,0,100,0), +(@PATH,3,6753.694,-7696.1216,127.648926,NULL,0,0,0,100,0), +(@PATH,4,6775.1753,-7696.5415,127.78203,NULL,0,0,0,100,0), +(@PATH,5,6790.143,-7693.9673,127.870865,NULL,10000,0,0,100,0), +(@PATH,6,6775.1753,-7696.5415,127.78203,NULL,0,0,0,100,0), +(@PATH,7,6753.694,-7696.1216,127.648926,NULL,0,0,0,100,0), +(@PATH,8,6770.124,-7687.202,127.80886,NULL,0,0,0,100,0); +-- 0x20449C4240188E4000003A0000F9A062 .go xyz 6787.902 -7683.4673 128.29967 + +-- Pathing for Budd's Bodyguard Entry: 25145 +SET @NPC := @CGUID+91; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=6744.1895,`position_y`=-7633.3774,`position_z`=126.5975 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,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,6744.1895,-7633.3774,126.5975,NULL,15000,0,0,100,0), +(@PATH,2,6740.213,-7623.264,126.56966,NULL,0,0,0,100,0), +(@PATH,3,6741.154,-7621.1943,126.42206,NULL,15000,0,0,100,0), +(@PATH,4,6741.474,-7630.288,126.70975,NULL,0,0,0,100,0), +(@PATH,5,6741.474,-7630.288,126.70975,0.05235987901687622,60000,0,0,100,0); +-- 0x20449C4240188E4000003A0001F9A064 .go xyz 6744.1895 -7633.3774 126.5975 + +-- Pathing for Budd Nedreck Entry: 23559 +SET @NPC := @CGUID+0; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,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,13,6774.665,-7608.3994,128.69945,4.677482128143310546,120000,0,0,100,0), +(@PATH,1,6780.8516,-7603.673,128.42677,NULL,0,0,0,100,0), +(@PATH,2,6784.799,-7594.7554,127.74554,NULL,0,0,0,100,0), +(@PATH,3,6788.038,-7582.694,126.88881,NULL,0,0,0,100,0), +(@PATH,4,6790.448,-7581.604,126.94719,NULL,0,0,0,100,0), +(@PATH,5,6784.936,-7614.9307,128.61794,NULL,0,0,0,100,0), +(@PATH,6,6785.526,-7622.941,128.2771,NULL,0,0,0,100,0), +(@PATH,7,6788.5684,-7623.8213,127.672455,NULL,0,0,0,100,0), +(@PATH,8,6788.5684,-7623.8213,127.672455,5.375614166259765625,30000,0,0,100,0), +(@PATH,9,6756.0806,-7623.6147,127.02387,NULL,0,0,0,100,0), +(@PATH,10,6768.783,-7620.2544,128.21086,NULL,0,0,0,100,0), +(@PATH,11,6782.1997,-7618.389,128.70926,NULL,0,0,0,100,0), +(@PATH,12,6774.665,-7608.3994,128.69945,NULL,0,0,0,100,0); +-- 0x20449C42401701C000003A000079A062 .go xyz 6780.8516 -7603.673 128.42677 + +-- Pathing for Overworked Nag Entry: 23747 +SET @NPC := 139326; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,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,6774.903,-7567.4263,127.545204,NULL,0,0,0,100,0), +(@PATH,2,6771.029,-7561.1504,127.1642,NULL,0,0,0,100,0), +(@PATH,3,6771.9604,-7556.53,127.05771,NULL,180000,0,0,100,0), +(@PATH,4,6777.2173,-7568.1,127.57065,NULL,0,0,0,100,0), +(@PATH,5,6779.196,-7573.2007,128.0896,NULL,0,0,0,100,0), +(@PATH,6,6779.196,-7573.2007,128.0896,6.108652114868164062,240000,0,0,100,0); +-- 0x20449C42401730C000003A000079A064 .go xyz 6774.903 -7567.4263 127.545204 + +-- Pathing for Overworked Nag Entry: 23747 +SET @NPC := 139327; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,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,6756.9644,-7570.461,127.0629,NULL,0,0,0,100,0), +(@PATH,2,6754.189,-7573.991,127.25931,NULL,0,0,0,100,0), +(@PATH,3,6758.559,-7566.889,126.6951,NULL,120000,0,0,100,0), +(@PATH,4,6766.457,-7568.1543,127.057495,NULL,0,0,0,100,0), +(@PATH,5,6767.385,-7574.116,127.04041,NULL,0,0,0,100,0), +(@PATH,6,6767.385,-7574.116,127.04041,1.553343057632446289,150000,0,0,100,0); + +DELETE FROM `creature_equip_template` WHERE (`CreatureID` = 23718); +INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`, `VerifiedBuild`) VALUES +(23718, 1, 2716, 0, 0, 57888); + +/* + Scripted Pathing +*/ +-- Pathing for Mack Entry: 23718 +SET @NPC := 139273; +SET @PATH := (@NPC * 10); +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,6752.6504,-7560.3726,126.15855,NULL,0,0,0,100,0), +(@PATH,2,6755.828,-7584.8135,127.33693,NULL,0,0,0,100,0), +(@PATH,3,6748.864,-7601.5347,127.00935,NULL,0,0,0,100,0), +(@PATH,4,6742.1353,-7608.194,126.093445,NULL,19400,0,0,100,0), -- Talk to Ameenah +(@PATH,5,6745.817,-7600.8325,126.54117,NULL,0,0,0,100,0), +(@PATH,6,6753.718,-7588.0425,127.563095,NULL,0,0,0,100,0), +(@PATH,7,6771.875,-7584.8584,127.290146,NULL,12960,0,0,100,0), -- Get Drink +(@PATH,8,6769.5576,-7577.0537,127.32736,NULL,0,0,0,100,0), +(@PATH,9,6770.5884,-7568.6104,127.41217,NULL,0,0,0,100,0), +(@PATH,10,6762.0464,-7555.414,126.224945,NULL,0,0,0,100,0), +(@PATH,11,6754.4546,-7549.847,126.13906,NULL,22670,0,0,100,0), -- Drink +(@PATH,12,6754.4546,-7549.847,126.13906,2.477182865142822265,11350,0,0,100,0), -- Cheer +(@PATH,13,6743.7188,-7553.3457,126.19035,NULL,0,0,0,100,0), +(@PATH,14,6743.7188,-7553.3457,126.19035,3.176499128341674804,0,0,0,100,0); +-- 0x20449C424017298000003A000079A064 .go xyz 6752.6504 -7560.3726 126.15855 + +-- Pathing for Mack Entry: 23718 +SET @NPC := 139273; +SET @PATH := (@NPC * 10) + 1; +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,6725.964,-7561.686,128.34082,NULL,9570,0,0,100,0), -- Sleep +(@PATH,2,6725.964,-7561.686,128.34082,0.279252678155899047,120000,0,0,100,0), +(@PATH,3,6743.7188,-7553.3457,126.19035,NULL,0,0,0,100,0), +(@PATH,4,6743.7188,-7553.3457,126.19035,3.176499128341674804,0,0,0,100,0); +-- 0x20449C424017298000003A000079A064 .go xyz 6743.7188 -7553.3457 126.19035 + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE (`entry` = 23718); +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -139273); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-139273, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - On Respawn - Set Event Phase 1'), +(-139273, 0, 1, 0, 109, 0, 100, 0, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - On Path Any Finished - Set Event Phase 1'), +(-139273, 0, 2, 0, 1, 1, 100, 0, 180000, 240000, 180000, 240000, 0, 0, 87, 2371800, 2371801, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Out of Combat - Run Random Script (Phase 1)'), +(-139273, 0, 3, 0, 1, 1, 100, 0, 6400, 20000, 6400, 20000, 0, 0, 10, 11, 21, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Out of Combat - Play Random Emote (11, 21) (Phase 1)'), +(-139273, 0, 4, 0, 108, 0, 100, 0, 4, 1392730, 0, 0, 0, 0, 80, 2371802, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - On Point 4 of Path 1392730 Reached - Run Script'), +(-139273, 0, 5, 0, 108, 0, 100, 0, 7, 1392730, 0, 0, 0, 0, 80, 2371803, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - On Point 7 of Path 1392730 Reached - Run Script'), +(-139273, 0, 6, 0, 108, 0, 100, 0, 11, 1392730, 0, 0, 0, 0, 80, 2371804, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - On Point 11 of Path 1392730 Reached - Run Script'), +(-139273, 0, 7, 0, 108, 0, 100, 0, 1, 1392731, 0, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - On Point 1 of Path 1392731 Reached - Say Line 4'), +(-139273, 0, 8, 0, 108, 0, 100, 0, 2, 1392731, 0, 0, 0, 0, 80, 2371805, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - On Point 2 of Path 1392731 Reached - Run Script'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` IN (2371800, 2371801)); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2371800, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 1392730, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Start Waypoint Path 1392730'), +(2371800, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Set Event Phase 0'), +(2371801, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 1392731, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Start Waypoint Path 1392731'), +(2371801, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Set Event Phase 0'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2371802); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2371802, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Say Line 0'), +(2371802, 9, 1, 0, 0, 0, 100, 0, 6400, 6400, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 10, 139264, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Say Line 0 (Ameenah)'), +(2371802, 9, 2, 0, 0, 0, 100, 0, 6400, 6400, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Say Line 1'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2371803); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2371803, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 17, 69, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Set Emote State 69'), +(2371803, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Say Line 2'), +(2371803, 9, 2, 0, 0, 0, 100, 0, 3200, 3200, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Set Emote State 0'), +(2371803, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 124, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Load Equipment Id 1'), +(2371803, 9, 4, 0, 0, 0, 100, 0, 3200, 3200, 0, 0, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Play Emote 92'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2371804); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2371804, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Play Emote 92'), +(2371804, 9, 1, 0, 0, 0, 100, 0, 3200, 3200, 0, 0, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Play Emote 92'), +(2371804, 9, 2, 0, 0, 0, 100, 0, 8100, 8100, 0, 0, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Play Emote 92'), +(2371804, 9, 3, 0, 0, 0, 100, 0, 11300, 11300, 0, 0, 0, 0, 11, 42333, 0, 0, 0, 0, 0, 10, 139292, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Cast \'Throw Torch\''), +(2371804, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 124, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Load Equipment Id 0'), +(2371804, 9, 5, 0, 0, 0, 100, 0, 6480, 6480, 0, 0, 0, 0, 5, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Play Emote 4'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2371805); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2371805, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 11, 32951, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Cast \'Sleeping Sleep\''), +(2371805, 9, 1, 0, 0, 0, 100, 0, 120000, 120000, 0, 0, 0, 0, 28, 32951, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mack - Actionlist - Remove Aura \'Sleeping Sleep\''); + +-- Pathing for Kurzel Entry: 23748 +SET @NPC := 139328; +SET @PATH := @NPC * 10; +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,6779.769,-7582.8804,127.5619,NULL,0,0,0,100,0), +(@PATH,2,6779.769,-7582.8804,127.5619,1.48352980613708496,1600,0,0,100,0), +(@PATH,3,6779.769,-7582.8804,127.5619,1.797689080238342285,9700,0,0,100,0), -- Pick Up Bags +(@PATH,4,6785.543,-7576.1157,127.56975,NULL,0,0,0,100,0), +(@PATH,5,6791.7485,-7543.877,126.10916,NULL,0,0,0,100,0), +(@PATH,6,6788.494,-7539.904,126.10916,NULL,0,0,0,100,0), +(@PATH,7,6788.494,-7539.904,126.10916,3.385938644409179687,24250,0,0,100,0), -- Leave Bags +(@PATH,8,6785.9644,-7574.473,127.53085,NULL,0,0,0,100,0); + +-- Pathing for Kurzel Entry: 23748 +SET @NPC := 139328; +SET @PATH := (@NPC * 10) + 1; +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,6779.9116,-7582.924,127.540245,NULL,0,0,0,100,0), +(@PATH,2,6779.9116,-7582.924,127.540245,1.48352980613708496,1600,0,0,100,0), +(@PATH,3,6779.9116,-7582.924,127.540245,1.797689080238342285,9700,0,0,100,0), -- Pick Up Bags +(@PATH,4,6785.543,-7576.1157,127.56975,NULL,0,0,0,100,0), +(@PATH,5,6791.7485,-7543.877,126.10916,NULL,0,0,0,100,0), +(@PATH,6,6788.494,-7539.904,126.10916,NULL,0,0,0,100,0), +(@PATH,7,6788.494,-7539.904,126.10916,3.385938644409179687,24250,0,0,100,0), -- Leave Bags +(@PATH,8,6796,-7535.8457,126.11561,NULL,0,0,0,100,0), +(@PATH,9,6796,-7535.8457,126.11561,4.852015495300292968,6400,0,0,100,0), -- Kick +(@PATH,10,6789.434,-7551.1094,126.23186,NULL,0,0,0,100,0), +(@PATH,11,6786.1133,-7575.298,127.538246,NULL,0,0,0,100,0); +-- 0x20449C424017310000003A000079A062 .go xyz 6779.9116 -7582.924 127.540245 + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE (`entry` = 23748); +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -139328); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-139328, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 87, 2374800, 2374801, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - On Respawn - Start Random Path'), +(-139328, 0, 1, 0, 108, 0, 100, 0, 3, 0, 0, 0, 0, 0, 80, 2374802, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - On Point 3 of Path Any Reached - Run Script \'Pick Up Bags\''), +(-139328, 0, 2, 0, 108, 0, 100, 0, 7, 0, 0, 0, 0, 0, 80, 2374803, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - On Point 7 of Path Any Reached - Run Script \'Drop-Off Bags\''), +(-139328, 0, 3, 0, 108, 0, 100, 0, 9, 1393281, 0, 0, 0, 0, 80, 2374804, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - On Point 9 of Path 1393281 Reached - Run Script \'Kick Turgore\''), +(-139328, 0, 4, 0, 109, 0, 100, 0, 0, 0, 0, 0, 0, 0, 87, 2374800, 2374801, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - On Path Finished - Start Random Path'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` IN (2374800, 2374801)); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2374800, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 1393280, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Start Random Path'), +(2374801, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 1393281, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Start Random Path'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2374802); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2374802, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Set Flag Standstate Kneel'), +(2374802, 9, 1, 0, 0, 0, 100, 0, 3250, 3250, 0, 0, 0, 0, 124, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Load Equipment Id 1'), +(2374802, 9, 2, 0, 0, 0, 100, 0, 6450, 6450, 0, 0, 0, 0, 91, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Remove FlagStandstate Kneel'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2374803); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2374803, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Set Flag Standstate Kneel'), +(2374803, 9, 1, 0, 0, 0, 100, 0, 3200, 3200, 0, 0, 0, 0, 124, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Load Equipment Id 0'), +(2374803, 9, 2, 0, 0, 0, 100, 0, 21000, 21000, 0, 0, 0, 0, 91, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Remove FlagStandstate Kneel'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2374804); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2374804, 9, 0, 0, 0, 0, 100, 0, 400, 400, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Say Line 0'), +(2374804, 9, 1, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kurzel - Actionlist - Say Line 1'); + +-- Pathing for Garg Entry: 23745 +SET @NPC := 139275; +SET @PATH := @NPC * 10; +DELETE FROM `waypoint_data` WHERE `id` BETWEEN @PATH AND @PATH+3; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +-- Go Path +(@PATH+0,1,6768.6436,-7638.577,127.382996,NULL,0,0,0,100,0), +(@PATH+0,2,6762.757,-7665.549,126.44116,NULL,14545,0,0,100,0), -- Kick +-- Return Paths +(@PATH+1,1,6762.757,-7665.549,126.44116,NULL,0,0,0,100,0), +(@PATH+1,2,6772.7305,-7667.0645,126.102066,NULL,0,0,0,100,0), +(@PATH+1,3,6774.489,-7663.8013,126.18675,NULL,8050,0,0,100,0), -- Fish +(@PATH+1,4,6774.404,-7640.1978,127.615875,NULL,0,0,0,100,0), +(@PATH+1,5,6774.364,-7632.2266,127.38222,NULL,0,0,0,100,0), +(@PATH+1,6,6774.364,-7632.2266,127.38222,4.014257431030273437,25900,0,0,100,0), -- Eat +(@PATH+2,1,6772.7305,-7667.0645,126.102066,NULL,0,0,0,100,0), +(@PATH+2,2,6774.489,-7663.8013,126.18675,NULL,8050,0,0,100,0), -- Fish +(@PATH+2,3,6771.4478,-7652.6304,127.296295,NULL,0,0,0,100,0), +(@PATH+2,4,6774.404,-7640.1978,127.615875,NULL,0,0,0,100,0), +(@PATH+2,5,6774.364,-7632.2266,127.38222,NULL,0,0,0,100,0), +(@PATH+2,6,6774.364,-7632.2266,127.38222,4.014257431030273437,25900,0,0,100,0), -- Eat +(@PATH+3,1,6774.489,-7663.8013,126.18675,NULL,8050,0,0,100,0), -- Fish +(@PATH+3,2,6771.4478,-7652.6304,127.296295,NULL,0,0,0,100,0), +(@PATH+3,3,6774.404,-7640.1978,127.615875,NULL,0,0,0,100,0), +(@PATH+3,4,6774.364,-7632.2266,127.38222,NULL,0,0,0,100,0), +(@PATH+3,5,6774.364,-7632.2266,127.38222,4.014257431030273437,25900,0,0,100,0); -- Eat +-- 0x20449C424017304000003A000079A063 .go xyz 6762.757 -7665.549 126.44116 + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE (`entry` = 23745); +DELETE FROM `creature_equip_template` WHERE (`CreatureID` = 23745); +INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`, `VerifiedBuild`) VALUES +(23745, 1, 2023, 0, 0, 53788), -- Spear +(23745, 2, 6228, 0, 0, 53788); -- Fish + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2374500); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2374500, 9, 0, 0, 0, 0, 100, 0, 3200, 3200, 0, 0, 0, 0, 5, 60, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Play Emote 60'), +(2374500, 9, 1, 0, 0, 0, 100, 0, 3200, 3200, 0, 0, 0, 0, 5, 71, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Play Emote 71'), +(2374500, 9, 2, 0, 0, 0, 100, 0, 8050, 8050, 0, 0, 0, 0, 233, 1392751, 1392753, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Start Random Path'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2374501); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2374501, 9, 0, 0, 0, 0, 100, 0, 3200, 3200, 0, 0, 0, 0, 5, 36, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Play Emote 36'), +(2374501, 9, 1, 0, 0, 0, 100, 0, 3200, 3200, 0, 0, 0, 0, 124, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Load Equipment Id 2 (Fish)'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2374502); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2374502, 9, 0, 0, 0, 0, 100, 0, 1200, 1200, 0, 0, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Play Emote 92'), +(2374502, 9, 1, 0, 0, 0, 100, 0, 6450, 6450, 0, 0, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Play Emote 92'), +(2374502, 9, 2, 0, 0, 0, 100, 0, 9700, 9700, 0, 0, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Play Emote 92'), +(2374502, 9, 3, 0, 0, 0, 100, 0, 9700, 9700, 0, 0, 0, 0, 124, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Load Equipment Id 1 (Spear)'), +(2374502, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 1392750, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - Actionlist - Start Path'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -139275); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-139275, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 1392750, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - On Respawn - Start Path'), +(-139275, 0, 1, 0, 109, 0, 100, 0, 0, 1392750, 0, 0, 0, 0, 80, 2374500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - On Path Initial Path Finished - Run Script \'Kick Troll\''), +(-139275, 0, 2, 0, 108, 0, 100, 0, 3, 1392751, 0, 0, 0, 0, 80, 2374501, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - On Point Reached - Run Script \'Catch Fish\''), +(-139275, 0, 3, 0, 108, 0, 100, 0, 2, 1392752, 0, 0, 0, 0, 80, 2374501, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - On Point Reached - Run Script \'Catch Fish\''), +(-139275, 0, 4, 0, 108, 0, 100, 0, 1, 1392753, 0, 0, 0, 0, 80, 2374501, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - On Point Reached - Run Script \'Catch Fish\''), +(-139275, 0, 5, 0, 109, 0, 100, 0, 0, 1392751, 0, 0, 0, 0, 80, 2374502, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - On Path Finished - Run Script \'Eat Fish and Restart Event\''), +(-139275, 0, 6, 0, 109, 0, 100, 0, 0, 1392752, 0, 0, 0, 0, 80, 2374502, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - On Path Finished - Run Script \'Eat Fish and Restart Event\''), +(-139275, 0, 7, 0, 109, 0, 100, 0, 0, 1392753, 0, 0, 0, 0, 80, 2374502, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Garg - On Path Finished - Run Script \'Eat Fish and Restart Event\''); + +-- Pathing for Prigmon Entry: 23761 +SET @NPC := 139329; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=6769.81,`position_y`=-7616.6704,`position_z`=128.4896 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,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,6769.81,-7616.6704,128.4896,NULL,40600,0,0,100,0), -- EmoteState 133 +(@PATH,2,6765.559,-7622.009,127.863716,NULL,0,0,0,100,0), +(@PATH,3,6747.774,-7635.6206,126.93343,NULL,40600,0,0,100,0); -- EmoteState 133 +-- 0x20449C424017344000003A000079A064 .go xyz 6769.81 -7616.6704 128.4896 + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 23761; + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -139329); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-139329, 0, 0, 0, 108, 0, 100, 0, 1, 1393290, 0, 0, 0, 0, 80, 2376100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Prigmon - On Point Reached - Run Script'), +(-139329, 0, 1, 0, 108, 0, 100, 0, 3, 1393290, 0, 0, 0, 0, 80, 2376100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Prigmon - On Point Reached - Run Script'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2376100); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2376100, 9, 0, 0, 0, 0, 100, 0, 1700, 1700, 0, 0, 0, 0, 17, 133, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Prigmon - Actionlist - Set Emote State 133'), +(2376100, 9, 1, 0, 0, 0, 100, 0, 29100, 29100, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Prigmon - Actionlist - Set Emote State 0'), +(2376100, 9, 2, 0, 0, 0, 100, 0, 3240, 3240, 0, 0, 0, 0, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Prigmon - Actionlist - Set Flag Standstate Kneel'), +(2376100, 9, 3, 0, 0, 0, 100, 0, 6450, 6450, 0, 0, 0, 0, 91, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Prigmon - Actionlist - Remove FlagStandstate Kneel'); + +-- Pathing for Donna Brascoe Entry: 23858 +SET @NPC := 139333; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,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,6771.347,-7607.2363,128.5081,NULL,0,0,0,100,0), +(@PATH,2,6771.347,-7607.2363,128.5081,2.897246599197387695,30000,0,0,100,0), +(@PATH,3,6762.7954,-7614.173,128.21152,NULL,0,0,0,100,0), +(@PATH,4,6757.339,-7613.1157,128.08092,NULL,0,0,0,100,0), +(@PATH,5,6757.339,-7613.1157,128.08092,0.575958669185638427,30000,0,0,100,0), +(@PATH,6,6764.669,-7612.788,128.36795,NULL,0,0,0,100,0), +(@PATH,7,6764.4897,-7610.385,128.54819,NULL,0,0,0,100,0), +(@PATH,8,6764.4897,-7610.385,128.54819,5.410520553588867187,60000,0,0,100,0); +-- 0x20449C4240174C8000003A000079A065 .go xyz 6771.347 -7607.2363 128.5081 + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE (`entry` = 23858); +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -139333); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-139333, 0, 0, 0, 108, 0, 100, 0, 2, 1393330, 0, 0, 0, 0, 80, 2385800, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Donna Brascoe - On Point 2 of Path 1393330 Reached - Run Script'), +(-139333, 0, 1, 0, 108, 0, 100, 0, 5, 1393330, 0, 0, 0, 0, 80, 2385800, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Donna Brascoe - On Point 5 of Path 1393330 Reached - Run Script'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2385800); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2385800, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 17, 173, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Donna Brascoe - Actionlist - Set Emote State 173'), +(2385800, 9, 1, 0, 0, 0, 100, 0, 30000, 30000, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Donna Brascoe - Actionlist - Set Emote State 0'); + +-- Pathing for Samir Entry: 23724 +SET @NPC := 139274; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=6765.5796,`position_y`=-7632.0947,`position_z`=127.259575 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,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,6765.5796,-7632.0947,127.259575,NULL,0,0,0,100,0), +(@PATH,2,6765.5796,-7632.0947,127.259575,4.991641521453857421,24000,0,0,100,0), +(@PATH,3,6742.9854,-7615.5625,126.163506,NULL,24000,0,0,100,0), +(@PATH,4,6767.635,-7622.185,127.99035,NULL,0,0,0,100,0), +(@PATH,5,6787.145,-7619.097,128.1925,NULL,30000,0,0,100,0), +(@PATH,6,6765.5684,-7632.1235,127.25732,NULL,0,0,0,100,0), +(@PATH,7,6782.38,-7627.6665,128.41327,NULL,0,0,0,100,0); +-- 0x20449C4240172B0000003A000079A064 .go xyz 6765.5796 -7632.0947 127.259575 + +DELETE FROM `creature_equip_template` WHERE (`CreatureID` = 23764); +INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`, `VerifiedBuild`) VALUES +(23764, 1, 2717, 0, 0, 53788); + +-- Pathing for Marge Entry: 23764 +SET @NPC := 139331; +SET @PATH := @NPC * 10; +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,6707.7837,-7581.739,126.92148,NULL,0,1,0,100,0), +(@PATH,2,6706.914,-7601.817,125.75387,NULL,0,1,0,100,0), +(@PATH,3,6717.3823,-7607.291,126.25313,NULL,0,1,0,100,0), +(@PATH,4,6767.432,-7593.558,127.700195,NULL,0,1,0,100,0), +(@PATH,5,6771.6353,-7607.7554,128.52863,NULL,0,1,0,100,0), +(@PATH,6,6766.284,-7613.7754,128.30774,NULL,0,1,0,100,0), +(@PATH,7,6754.3076,-7614.549,127.613434,NULL,0,1,0,100,0), +(@PATH,8,6745.358,-7601.0747,126.58633,NULL,0,1,0,100,0), +(@PATH,9,6752.4004,-7585.6665,127.67639,NULL,0,1,0,100,0), +(@PATH,10,6766.2617,-7565.039,127.083145,NULL,0,1,0,100,0), +(@PATH,11,6785.4507,-7567.6406,126.813774,NULL,0,1,0,100,0), +(@PATH,12,6786.0024,-7585.2285,127.08642,NULL,0,1,0,100,0), +(@PATH,13,6769.0938,-7591.8647,127.65797,NULL,0,1,0,100,0), +(@PATH,14,6756.7524,-7583.4106,126.999275,NULL,0,1,0,100,0), +(@PATH,15,6744.7173,-7570.9653,126.96568,NULL,0,1,0,100,0), +(@PATH,16,6740.1978,-7559.655,126.451454,NULL,0,1,0,100,0); -- Throw Bottle +-- 0x20449C424017350000003A000079A065 .go xyz 6707.7837 -7581.739 126.92148 + +DELETE FROM `waypoint_data` WHERE `id`=@PATH+1; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH+1,1,6737.375,-7556.5435,126.62047,NULL,8100,0,0,100,0), -- Pick Up New Bottle +(@PATH+1,2,6740.1978,-7559.655,126.451454,NULL,0,0,0,100,0), +(@PATH+1,3,6740.0806,-7559.5254,126.45913,NULL,0,0,0,100,0), +(@PATH+1,4,6740.0806,-7559.5254,126.45913,1.972222089767456054,0,0,0,100,0); + +-- Pathing for Brend Entry: 23762 +SET @NPC := 139330; +SET @PATH := @NPC * 10; +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,6745.162,-7592.8345,126.13598,NULL,0,1,0,100,0), +(@PATH,2,6754.219,-7617.1416,127.310326,NULL,0,1,0,100,0), +(@PATH,3,6771.998,-7623.348,128.08301,NULL,0,1,0,100,0), +(@PATH,4,6785.475,-7616.0693,128.53796,NULL,0,1,0,100,0), +(@PATH,5,6789.082,-7594.475,127.34944,NULL,0,1,0,100,0), +(@PATH,6,6789.169,-7580.259,127.03157,NULL,0,1,0,100,0), +(@PATH,7,6783.683,-7567.1753,126.75947,NULL,0,1,0,100,0), +(@PATH,8,6774.5586,-7560.7173,127.01713,NULL,0,1,0,100,0), +(@PATH,9,6759.7524,-7561.8696,126.23902,NULL,0,1,0,100,0), +(@PATH,10,6748.3784,-7577.643,127.507355,NULL,0,1,0,100,0), +(@PATH,11,6751.5986,-7612.553,127.2652,NULL,0,1,0,100,0), +(@PATH,12,6765.166,-7621.724,127.84164,NULL,0,1,0,100,0), +(@PATH,13,6783.303,-7611.415,128.59036,NULL,0,1,0,100,0), +(@PATH,14,6789.3887,-7579.3794,127.28639,NULL,0,1,0,100,0), +(@PATH,15,6777.856,-7558.4507,126.401634,NULL,0,1,0,100,0), +(@PATH,16,6750.376,-7561.012,126.14468,NULL,16000,1,0,100,0), -- Hit By Bottle (42333), StandState: 7 for 16s +(@PATH,17,6736.026,-7558.7544,126.89935,NULL,0,0,0,100,0), +(@PATH,18,6736.026,-7558.7544,126.89935,1.48352980613708496,0,0,0,100,0); +-- 0x20449C424017348000003A000079A063 .go xyz 6745.162 -7592.8345 126.13598 + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE (`entry` IN (23762, 23764, 23766)); +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -139331); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-139331, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - On Respawn - Set Event Phase 1'), +(-139331, 0, 1, 0, 1, 1, 100, 0, 120000, 180000, 120000, 180000, 0, 0, 80, 2376400, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - Out of Combat - Run Script (Phase 1)'), +(-139331, 0, 2, 0, 1, 1, 100, 0, 6400, 21600, 6400, 21600, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - Out of Combat - Play Emote 92 (Phase 1)'), +(-139331, 0, 3, 4, 38, 0, 100, 0, 1, 1, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - On Data Set 1 1 - Stop Follow'), +(-139331, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 1393311, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - On Data Set 1 1 - Start Waypoint Path'), +(-139331, 0, 6, 0, 108, 0, 100, 0, 1, 1393311, 0, 0, 0, 0, 80, 2376401, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - On Point 1 of Path 1393311 Reached - Run Script \'Pick Up Bottle\''), +(-139331, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 124, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - On Data Set 1 1 - Load Equipment Id 0'), +(-139331, 0, 7, 0, 109, 0, 100, 0, 0, 1393311, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - On Path 1393311 Finished - Set Event Phase 1'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2376400); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2376400, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Set Event Phase 0'), +(2376400, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 10, 139330, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Set Event Phase 0 (Brend)'), +(2376400, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Say Line 0'), +(2376400, 9, 3, 0, 0, 0, 100, 0, 5250, 5250, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 10, 139330, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Say Line 0 (Brend)'), +(2376400, 9, 4, 0, 0, 0, 100, 0, 8080, 8080, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 10, 139330, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Say Line 1 (Brend)'), +(2376400, 9, 5, 0, 0, 0, 100, 0, 2800, 2800, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Say Line 3'), +(2376400, 9, 6, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 0, 29, 10, 180, 0, 0, 0, 0, 10, 139330, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Start Follow Closest Creature \'Brend\''), +(2376400, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 1393300, 0, 0, 0, 0, 0, 10, 139330, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Start Waypoint Path (Brend)'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -139330); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-139330, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Brend - On Respawn - Set Event Phase 1'), +(-139330, 0, 1, 0, 1, 1, 100, 0, 6400, 21600, 6400, 21600, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Brend - Out of Combat - Play Emote 92 (Phase 1)'), +(-139330, 0, 2, 0, 108, 0, 100, 0, 16, 1393300, 0, 0, 0, 0, 80, 2376200, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Brend - On Point 16 of Path 1393300 Reached - Run Script \'Hit by Bottle\''), +(-139330, 0, 3, 0, 109, 0, 100, 0, 0, 1393300, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Brend - On Path 1393300 Finished - Set Event Phase 1'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2376200); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2376200, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 10, 139331, 0, 0, 0, 0, 0, 0, 0, 'Brend - Actionlist - Set Data 1 1'), +(2376200, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 86, 42333, 0, 10, 139331, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Brend - Actionlist - Cross Cast \'Throw Torch\''), +(2376200, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 90, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Brend - Actionlist - Set Flag Standstate Dead'), +(2376200, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 10, 139331, 0, 0, 0, 0, 0, 0, 0, 'Brend - Actionlist - Say Line 4 (Marge)'), +(2376200, 9, 4, 0, 0, 0, 100, 0, 16000, 16000, 0, 0, 0, 0, 91, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Brend - Actionlist - Remove FlagStandstate Dead'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2376401); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2376401, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Set Flag Standstate Kneel'), +(2376401, 9, 1, 0, 0, 0, 100, 0, 8100, 8100, 0, 0, 0, 0, 91, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Remove FlagStandstate Kneel'), +(2376401, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 124, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Marge - Actionlist - Load Equipment Id 1'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -139332); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-139332, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Morgom - On Respawn - Set Event Phase 1'), +(-139332, 0, 1, 0, 1, 1, 100, 0, 6400, 21600, 6400, 21600, 0, 0, 5, 92, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Morgom - Out of Combat - Play Emote 92 (Phase 1)'); diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 84b726ab5..a904e5787 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -634,6 +634,9 @@ void SmartAI::MovementInform(uint32 MovementType, uint32 Data) if (MovementType == POINT_MOTION_TYPE && Data == SMART_ESCORT_LAST_OOC_POINT) me->ClearUnitState(UNIT_STATE_EVADE); + if (MovementType == WAYPOINT_MOTION_TYPE) + GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_DATA_REACHED, nullptr, Data + 1); // Data + 1 to align smart_scripts and waypoint_data Id rows + GetScript()->ProcessEventsFor(SMART_EVENT_MOVEMENTINFORM, nullptr, MovementType, Data); if (!HasEscortState(SMART_ESCORT_ESCORTING)) return; @@ -1150,6 +1153,11 @@ void SmartAI::OnSpellClick(Unit* clicker, bool& /*result*/) GetScript()->ProcessEventsFor(SMART_EVENT_ON_SPELLCLICK, clicker); } +void SmartAI::PathEndReached(uint32 pathId) +{ + GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_DATA_ENDED, nullptr, 0, me->GetWaypointPath()); +} + void SmartGameObjectAI::SummonedCreatureDies(Creature* summon, Unit* /*killer*/) { GetScript()->ProcessEventsFor(SMART_EVENT_SUMMONED_UNIT_DIES, summon); diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 79d72c807..acb52d904 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -204,6 +204,8 @@ public: void OnSpellClick(Unit* clicker, bool& result) override; + void PathEndReached(uint32 pathId) override; + // Xinef void SetWPPauseTimer(uint32 time) { mWPPauseTimer = time; } diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 89df09146..a91489dae 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -3057,6 +3057,63 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } break; } + case SMART_ACTION_WAYPOINT_DATA_START: + { + if (e.action.wpData.pathId) + { + for (WorldObject* target : targets) + { + if (IsCreature(target)) + { + target->ToCreature()->LoadPath(e.action.wpData.pathId); + target->ToCreature()->GetMotionMaster()->MovePath(e.action.wpData.pathId, e.action.wpData.repeat); + } + } + } + + break; + } + case SMART_ACTION_WAYPOINT_DATA_RANDOM: + { + if (e.action.wpDataRandom.pathId1 && e.action.wpDataRandom.pathId2) + { + for (WorldObject* target : targets) + { + if (IsCreature(target)) + { + uint32 path = urand(e.action.wpDataRandom.pathId1, e.action.wpDataRandom.pathId2); + target->ToCreature()->LoadPath(path); + target->ToCreature()->GetMotionMaster()->MovePath(path, e.action.wpDataRandom.repeat); + } + } + } + + break; + } + case SMART_ACTION_MOVEMENT_STOP: + { + for (WorldObject* target : targets) + if (IsUnit(target)) + target->ToUnit()->StopMoving(); + + break; + } + case SMART_ACTION_MOVEMENT_PAUSE: + { + for (WorldObject* target : targets) + if (IsUnit(target)) + target->ToUnit()->PauseMovement(e.action.move.timer); + + break; + } + case SMART_ACTION_MOVEMENT_RESUME: + { + for (WorldObject* target : targets) + if (IsUnit(target)) + target->ToUnit()->ResumeMovement(e.action.move.timer); + + break; + } default: LOG_ERROR("sql.sql", "SmartScript::ProcessAction: Entry {} SourceType {}, Event {}, Unhandled Action type {}", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType()); break; @@ -4538,6 +4595,14 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui RecalcTimer(e, 1200, 1200); break; } + case SMART_EVENT_WAYPOINT_DATA_REACHED: + case SMART_EVENT_WAYPOINT_DATA_ENDED: + { + if (!me || (e.event.wpData.pointId && var0 != e.event.wpData.pointId) || (e.event.wpData.pathId && me->GetWaypointPath() != e.event.wpData.pathId)) + return; + ProcessAction(e, unit); + break; + } default: LOG_ERROR("sql.sql", "SmartScript::ProcessEvent: Unhandled Event type {}", e.GetEventType()); break; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 7a7bf270f..1f2c3ae9b 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -574,6 +574,8 @@ bool SmartAIMgr::CheckUnusedEventParams(SmartScriptHolder const& e) case SMART_EVENT_AREA_CASTING: return sizeof(SmartEvent::minMaxRepeat); case SMART_EVENT_AREA_RANGE: return sizeof(SmartEvent::minMaxRepeat); case SMART_EVENT_SUMMONED_UNIT_EVADE: return sizeof(SmartEvent::summoned); + case SMART_EVENT_WAYPOINT_DATA_REACHED: return sizeof(SmartEvent::wpData); + case SMART_EVENT_WAYPOINT_DATA_ENDED: return sizeof(SmartEvent::wpData); default: LOG_WARN("sql.sql", "SmartAIMgr: entryorguid {} source_type {} id {} action_type {} is using an event {} with no unused params specified in SmartAIMgr::CheckUnusedEventParams(), please report this.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), e.GetEventType()); @@ -769,6 +771,11 @@ bool SmartAIMgr::CheckUnusedActionParams(SmartScriptHolder const& e) case SMART_ACTION_PLAY_SPELL_VISUAL: return sizeof(SmartAction::spellVisual); case SMART_ACTION_FOLLOW_GROUP: return sizeof(SmartAction::followGroup); case SMART_ACTION_SET_ORIENTATION_TARGET: return sizeof(SmartAction::orientationTarget); + case SMART_ACTION_WAYPOINT_DATA_START: return sizeof(SmartAction::wpData); + case SMART_ACTION_WAYPOINT_DATA_RANDOM: return sizeof(SmartAction::wpDataRandom); + case SMART_ACTION_MOVEMENT_STOP: return NO_PARAMS; + case SMART_ACTION_MOVEMENT_PAUSE: return sizeof(SmartAction::move); + case SMART_ACTION_MOVEMENT_RESUME: return sizeof(SmartAction::move); default: LOG_WARN("sql.sql", "SmartAIMgr: entryorguid {} source_type {} id {} action_type {} is using an action with no unused params specified in SmartAIMgr::CheckUnusedActionParams(), please report this.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType()); @@ -1321,6 +1328,8 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) case SMART_EVENT_JUST_CREATED: case SMART_EVENT_FOLLOW_COMPLETED: case SMART_EVENT_ON_SPELLCLICK: + case SMART_EVENT_WAYPOINT_DATA_REACHED: + case SMART_EVENT_WAYPOINT_DATA_ENDED: break; default: LOG_ERROR("sql.sql", "SmartAIMgr: Not handled event_type({}), Entry {} SourceType {} Event {} Action {}, skipped.", e.GetEventType(), e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType()); @@ -1945,6 +1954,11 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) case SMART_ACTION_PLAY_SPELL_VISUAL: case SMART_ACTION_FOLLOW_GROUP: case SMART_ACTION_SET_ORIENTATION_TARGET: + case SMART_ACTION_WAYPOINT_DATA_START: + case SMART_ACTION_WAYPOINT_DATA_RANDOM: + case SMART_ACTION_MOVEMENT_STOP: + case SMART_ACTION_MOVEMENT_PAUSE: + case SMART_ACTION_MOVEMENT_RESUME: break; default: LOG_ERROR("sql.sql", "SmartAIMgr: Not handled action_type({}), event_type({}), Entry {} SourceType {} Event {}, skipped.", e.GetActionType(), e.GetEventType(), e.entryOrGuid, e.GetScriptType(), e.event_id); diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 73f5a8973..66d0deaa9 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -214,8 +214,10 @@ enum SMART_EVENT SMART_EVENT_AREA_CASTING = 105, // min, max, repeatMin, repeatMax, rangeMin, rangeMax SMART_EVENT_AREA_RANGE = 106, // min, max, repeatMin, repeatMax, rangeMin, rangeMax SMART_EVENT_SUMMONED_UNIT_EVADE = 107, // CreatureId(0 all), CooldownMin, CooldownMax + SMART_EVENT_WAYPOINT_DATA_REACHED = 108, // PointId (0: any), pathId (0: any) + SMART_EVENT_WAYPOINT_DATA_ENDED = 109, // PointId (0: any), pathId (0: any) - SMART_EVENT_AC_END = 108 + SMART_EVENT_AC_END = 110 }; struct SmartEvent @@ -507,6 +509,12 @@ struct SmartEvent uint32 timer; } nearUnitNegation; + struct + { + uint32 pointId; + uint32 pathId; + } wpData; + struct { uint32 param1; @@ -714,8 +722,13 @@ enum SMART_ACTION SMART_ACTION_PLAY_SPELL_VISUAL = 229, // visualId, visualIdImpact SMART_ACTION_FOLLOW_GROUP = 230, // followState, followType, dist SMART_ACTION_SET_ORIENTATION_TARGET = 231, // type, target_type, target_param1, target_param2, target_param3, target_param4 + SMART_ACTION_WAYPOINT_DATA_START = 232, // pathId, repeat + SMART_ACTION_WAYPOINT_DATA_RANDOM = 233, // pathId1, pathId2, repeat + SMART_ACTION_MOVEMENT_STOP = 234, // + SMART_ACTION_MOVEMENT_PAUSE = 235, // timer + SMART_ACTION_MOVEMENT_RESUME = 236, // timerOverride - SMART_ACTION_AC_END = 232, // placeholder + SMART_ACTION_AC_END = 237, // placeholder }; enum class SmartActionSummonCreatureFlags @@ -1434,6 +1447,24 @@ struct SmartAction uint32 targetParam3; uint32 targetParam4; } orientationTarget; + + struct + { + uint32 pathId; + SAIBool repeat; + } wpData; + + struct + { + uint32 pathId1; + uint32 pathId2; + SAIBool repeat; + } wpDataRandom; + + struct + { + uint32 timer; + } move; //! Note for any new future actions //! All parameters must have type uint32 @@ -1844,6 +1875,8 @@ const uint32 SmartAIEventMask[SMART_EVENT_AC_END][2] = {SMART_EVENT_AREA_CASTING, SMART_SCRIPT_TYPE_MASK_CREATURE }, {SMART_EVENT_AREA_RANGE, SMART_SCRIPT_TYPE_MASK_CREATURE }, {SMART_EVENT_SUMMONED_UNIT_EVADE, SMART_SCRIPT_TYPE_MASK_CREATURE + SMART_SCRIPT_TYPE_MASK_GAMEOBJECT }, + {SMART_EVENT_WAYPOINT_DATA_REACHED, SMART_SCRIPT_TYPE_MASK_CREATURE }, + {SMART_EVENT_WAYPOINT_DATA_ENDED, SMART_SCRIPT_TYPE_MASK_CREATURE }, }; enum SmartEventFlags From 539b4d99afc39cf0a9a10d997310eeffb1a10262 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 18 Apr 2024 13:32:40 +0000 Subject: [PATCH 04/20] chore(DB): import pending files Referenced commit(s): 6f154d0a6baa819645b497f52c0fc6c514825341 --- .../rev_1712889530436412200.sql => db_world/2024_04_18_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1712889530436412200.sql => db_world/2024_04_18_00.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1712889530436412200.sql b/data/sql/updates/db_world/2024_04_18_00.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1712889530436412200.sql rename to data/sql/updates/db_world/2024_04_18_00.sql index 20d6123ea..237c37982 100644 --- a/data/sql/updates/pending_db_world/rev_1712889530436412200.sql +++ b/data/sql/updates/db_world/2024_04_18_00.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_14_03 -> 2024_04_18_00 -- SET @CGUID := 139263; SET @OGUID := 100514; From c6cc88240fc2d33c5ffaf459ed02c22335134d78 Mon Sep 17 00:00:00 2001 From: sudlud Date: Fri, 19 Apr 2024 12:20:46 +0200 Subject: [PATCH 05/20] fix(DB/Gameobject): Sniffed Values for 'Fire' spawns (#18610) * fix(DB/Gameobject): Sniffed Values for 'Fire' spawns * Update rev_1711310669959067500.sql Remove three RP related spawns --- .../rev_1711310669959067500.sql | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1711310669959067500.sql diff --git a/data/sql/updates/pending_db_world/rev_1711310669959067500.sql b/data/sql/updates/pending_db_world/rev_1711310669959067500.sql new file mode 100644 index 000000000..842947033 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1711310669959067500.sql @@ -0,0 +1,123 @@ +-- Update gameobject 'Fire' with sniffed values +-- updated spawns +DELETE FROM `gameobject` WHERE (`id` IN (176519, 176516, 176520, 176521, 1766, 3084, 186075, 186076, 186082, 186069, 186068, 186077, 186078, 186055, 186054, 186079, 186058, 186062, 186081, 186053, 182864, 182865, 182866, 182994, 183005, 183006, 183007, 183008, 183009, 183010, 183431, 186080, 186072, 186064, 186049, 186050, 148850, 148858, 148847, 148849, 148848, 148861, 148860, 148846, 148859, 148864, 148862, 148863, 40199, 40200, 148843, 148844, 148845, 148857, 40201, 148856, 148851, 148853, 148854, 148855, 148852, 176517, 179121, 179122, 191300, 191865, 192156, 192157, 192158, 186555, 188605, 192159, 192160, 191862, 191866, 191867, 191869, 191870, 191871, 191873, 191874, 191875, 191876, 176518, 136950, 136952, 136955, 176460, 136947, 136948, 136949, 136951, 176427, 176428, 176429, 176430, 176431, 176432, 176433, 176434, 176435, 176437, 176440, 176441, 176443, 176446, 176457)) +AND (`guid` IN (11590, 11599, 11732, 11924, 1387, 14, 14078, 14080, 14081, 14082, 14084, 14090, 14091, 14094, 14098, 17917, 17918, 17921, 18503, 18519, 23675, 23676, 23677, 23931, 23932, 23933, 23934, 23935, 23936, 23937, 24338, 28129, 28494, 28496, 28505, 28506, 32025, 32033, 32035, 32037, 32039, 32041, 32043, 32046, 32056, 32058, 32061, 32063, 32065, 35667, 35670, 35672, 35674, 35676, 35678, 35680, 35683, 35685, 35687, 35689, 35691, 4550, 56158, 56159, 57632, 59127, 59660, 59667, 59676, 60118, 60242, 61165, 61224, 67189, 67197, 67200, 67203, 67205, 67207, 67211, 67213, 67215, 67217, 7039, 87863, 87864, 87865, 87867, 87895, 87896, 87897, 87898, 87953, 87954, 87955, 87956, 87957, 87958, 87959, 87960, 87961, 87963, 87966, 87967, 87969, 87972, 87976)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(11590, 176519, 1, 0, 0, 1, 1, 1647.2562255859375, -4201.95263671875, 56.48777008056640625, 1.788962006568908691, 0, 0, 0.77988433837890625, 0.625923693180084228, 120, 255, 1, "", 45435, NULL), +(11599, 176516, 1, 0, 0, 1, 1, 1656.168212890625, -4199.2421875, 56.48777008056640625, 1.562069892883300781, 0, 0, 0.704014778137207031, 0.71018528938293457, 120, 255, 1, "", 45435, NULL), +(11732, 176520, 1, 0, 0, 1, 1, 1644.838134765625, -4219.88916015625, 56.459930419921875, 1.788962006568908691, 0, 0, 0.77988433837890625, 0.625923693180084228, 120, 255, 1, "", 45435, NULL), +(11924, 176521, 1, 0, 0, 1, 1, 1654.32177734375, -4224.50927734375, 56.459930419921875, 3.52557229995727539, 0, 0, -0.98162651062011718, 0.190812408924102783, 120, 255, 1, "", 45435, NULL), +(1387, 1766, 0, 0, 0, 1, 1, -6372.62353515625, 571.3507080078125, 385.67242431640625, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 48632, NULL), +(14, 3084, 1, 0, 0, 1, 1, -602.42535400390625, -4250.5693359375, 37.51154327392578125, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45327, NULL), +(14078, 186075, 530, 0, 0, 1, 1, -2199.57666015625, 5452.07861328125, 51.11126708984375, 0.181981280446052551, 0, 0, 0.090865135192871093, 0.995863199234008789, 120, 255, 1, "", 45942, NULL), +(14080, 186076, 530, 0, 0, 1, 1, -2212.560791015625, 5437.11376953125, 51.11126708984375, 6.222121715545654296, 0, 0, -0.03052711486816406, 0.99953395128250122, 120, 255, 1, "", 45942, NULL), +(14081, 186082, 530, 0, 0, 1, 1, -2239.9501953125, 5460.11181640625, 53.49081039428710937, 6.226018428802490234, 0, 0, -0.0285797119140625, 0.999591529369354248, 120, 255, 1, "", 45942, NULL), +(14082, 186069, 530, 0, 0, 1, 1, -2192.951416015625, 5427.2353515625, 50.15360260009765625, 5.976747512817382812, 0, 0, -0.15262031555175781, 0.988284885883331298, 120, 255, 1, "", 45942, NULL), +(14084, 186068, 530, 0, 0, 1, 1, -2170.758544921875, 5423.2236328125, 50.15360260009765625, 5.976747512817382812, 0, 0, -0.15262031555175781, 0.988284885883331298, 120, 255, 1, "", 45942, NULL), +(14090, 186077, 530, 0, 0, 1, 1, -2222.55029296875, 5468.787109375, 53.49081039428710937, 6.226018428802490234, 0, 0, -0.0285797119140625, 0.999591529369354248, 120, 255, 1, "", 45942, NULL), +(14091, 186078, 530, 0, 0, 1, 1, -2234.832763671875, 5486.900390625, 55.3420257568359375, 5.979470252990722656, 0.042546272277832031, 0.030100822448730468, -0.15241241455078125, 0.986941874027252197, 120, 255, 1, "", 45942, NULL), +(14094, 186055, 530, 0, 0, 1, 1, -2178.1611328125, 5504.025390625, 64.18865966796875, 0.566224873065948486, 0, 0, 0.279345512390136718, 0.960190653800964355, 120, 255, 1, "", 45942, NULL), +(14098, 186054, 530, 0, 0, 1, 1, -2099.10107421875, 5483.62060546875, 53.37750244140625, 0.566224873065948486, 0, 0, 0.279345512390136718, 0.960190653800964355, 120, 255, 1, "", 45942, NULL), +(17917, 186079, 530, 0, 0, 1, 1, -2243.2900390625, 5503.86328125, 61.4079132080078125, 5.979001998901367187, 0.038714885711669921, 0.027390480041503906, -0.15244770050048828, 0.987173020839691162, 120, 255, 1, "", 45942, NULL), +(17918, 186058, 530, 0, 0, 1, 1, -2162.106689453125, 5559.0732421875, 65.23337554931640625, 3.551422595977783203, 0, 0, -0.97907829284667968, 0.203483849763870239, 120, 255, 1, "", 45942, NULL), +(17921, 186062, 530, 0, 0, 1, 1, -2237.644287109375, 5533.91845703125, 78.94709014892578125, 0.566224873065948486, 0, 0, 0.279345512390136718, 0.960190653800964355, 120, 255, 1, "", 45942, NULL), +(18503, 186081, 530, 0, 0, 1, 1, -2253.1591796875, 5477.76318359375, 55.14263153076171875, 5.979470252990722656, 0.042546272277832031, 0.030100822448730468, -0.15241241455078125, 0.986941874027252197, 120, 255, 1, "", 45942, NULL), +(18519, 186053, 530, 0, 0, 1, 1, -2083.525634765625, 5527.39013671875, 53.37750244140625, 3.741940736770629882, 0, 0, -0.95528507232666015, 0.29568636417388916, 120, 255, 1, "", 45942, NULL), +(23675, 182864, 530, 0, 0, 1, 1, -4060.03955078125, 2253.02490234375, 95.1575164794921875, 1.239183306694030761, 0, 0, 0.580702781677246093, 0.814115643501281738, 120, 255, 1, "", 48632, NULL), +(23676, 182865, 530, 0, 0, 1, 1, -4060.16943359375, 2251.917236328125, 95.1575164794921875, 4.380779743194580078, 0, 0, -0.81411457061767578, 0.580704271793365478, 120, 255, 1, "", 48632, NULL), +(23677, 182866, 530, 0, 0, 1, 1, -4059.13427734375, 2251.970947265625, 95.1575164794921875, 0.715584874153137207, 0, 0, 0.350207328796386718, 0.936672210693359375, 120, 255, 1, "", 48632, NULL), +(23931, 182994, 530, 0, 0, 1, 1, -3958.581298828125, 2268.483642578125, 99.28211212158203125, 2.565607547760009765, -0.00389385223388671, -0.00780868530273437, 0.958783149719238281, 0.284004807472229003, 120, 255, 1, "", 45942, NULL), +(23932, 183005, 530, 0, 0, 1, 1, -4075.4111328125, 2190.83984375, 107.8797225952148437, 4.38950347900390625, 0, 0, -0.81157398223876953, 0.584249675273895263, 120, 255, 1, "", 45854, NULL), +(23933, 183006, 530, 0, 0, 1, 1, -4093.921630859375, 2170.983154296875, 106.9764785766601562, 6.222100734710693359, 0, 0, -0.03053760528564453, 0.999533593654632568, 120, 255, 1, "", 45854, NULL), +(23934, 183007, 530, 0, 0, 1, 1, -4092.416015625, 2170.9375, 106.9764785766601562, 3.080448389053344726, 0, 0, 0.999532699584960937, 0.030567342415452003, 120, 255, 1, "", 45854, NULL), +(23935, 183008, 530, 0, 0, 1, 1, -4084.650634765625, 2160.1103515625, 97.445587158203125, 5.873008251190185546, -0.00810480117797851, 0.003233909606933593, -0.20363330841064453, 0.979008376598358154, 120, 255, 1, "", 45854, NULL), +(23936, 183009, 530, 0, 0, 1, 1, -4078.30615234375, 2186.728271484375, 100.5011444091796875, 1.160617351531982421, -0.00801753997802734, -0.00344371795654296, 0.548272132873535156, 0.836254477500915527, 120, 255, 1, "", 45854, NULL), +(23937, 183010, 530, 0, 0, 1, 1, -4097.5869140625, 2207.700927734375, 97.445587158203125, 2.731409311294555664, -0.00323390960693359, -0.00810432434082031, 0.979007720947265625, 0.203636407852172851, 120, 255, 1, "", 45854, NULL), +(24338, 183431, 530, 0, 0, 1, 1, -2086.437255859375, 5286.59619140625, -37.2973403930664062, 5.174901962280273437, 0, 0, -0.52621364593505859, 0.850352406501770019, 120, 255, 1, "", 45942, NULL), +(28129, 186080, 530, 0, 0, 1, 1, -2263.34814453125, 5493.8623046875, 59.00399017333984375, 5.979001998901367187, 0.038714885711669921, 0.027390480041503906, -0.15244770050048828, 0.987173020839691162, 120, 255, 1, "", 45942, NULL), +(28494, 186072, 530, 0, 0, 1, 1, -2229.772216796875, 5588.6337890625, 63.67055511474609375, 3.795089006423950195, 0, 0, -0.94709110260009765, 0.320964902639389038, 120, 255, 1, "", 45942, NULL), +(28496, 186064, 530, 0, 0, 1, 1, -2223.67724609375, 5572.11181640625, 78.94709014892578125, 3.795089006423950195, 0, 0, -0.94709110260009765, 0.320964902639389038, 120, 255, 1, "", 45942, NULL), +(28505, 186049, 530, 0, 0, 1, 1, -2326.962890625, 5582.23828125, 64.06670379638671875, 6.205697059631347656, 0, 0, -0.03873443603515625, 0.999249517917633056, 120, 255, 1, "", 45704, NULL), +(28506, 186050, 530, 0, 0, 1, 1, -2326.4443359375, 5549.2646484375, 64.00931549072265625, 6.205697059631347656, 0, 0, -0.03873443603515625, 0.999249517917633056, 120, 255, 1, "", 45704, NULL), +(32025, 148850, 129, 0, 0, 1, 1, 2563.349853515625, 1000.1551513671875, 61.16812896728515625, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 46248, NULL), +(32033, 148858, 129, 0, 0, 1, 1, 2516.568359375, 881.2669677734375, 61.1050567626953125, 0.20071132481098175, 0, 0, 0.100187301635742187, 0.994968593120574951, 7200, 255, 1, "", 46248, NULL), +(32035, 148847, 129, 0, 0, 1, 1, 2459.193115234375, 956.07318115234375, 35.41400909423828125, 3.141225099563598632, -0.00516891479492187, -0.03554916381835937, 0.999354362487792968, 0, 7200, 255, 1, "", 46248, NULL), +(32037, 148849, 129, 0, 0, 1, 1, 2455.708984375, 925.76708984375, 48.12718963623046875, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 46248, NULL), +(32039, 148848, 129, 0, 0, 1, 1, 2529.55908203125, 858.3714599609375, 48.50664901733398437, 3.037367582321166992, -0.24060297012329101, -0.00289440155029296, 0.969492912292480468, 0.046747669577598571, 7200, 255, 1, "", 46248, NULL), +(32041, 148861, 129, 0, 0, 1, 1, 2544.20703125, 865.916015625, 49.71361923217773437, 3.111782073974609375, -0.21131849288940429, 0.047257423400878906, 0.975975990295410156, 0.024126727133989334, 7200, 255, 1, "", 46248, NULL), +(32043, 148860, 129, 0, 0, 1, 1, 2543.59423828125, 850.7335205078125, 51.31195831298828125, 3.146761894226074218, 0.021937847137451171, -0.00812530517578125, -0.99972343444824218, 0.00240450631827116, 7200, 255, 1, "", 46248, NULL), +(32046, 148846, 129, 0, 0, 1, 1, 2439.51416015625, 996.78271484375, 49.21335220336914062, 2.734474897384643554, 0.00810098648071289, 0.107633590698242187, 0.973329544067382812, 0.202432632446289062, 7200, 255, 1, "", 46248, NULL), +(32056, 148859, 129, 0, 0, 1, 1, 2499.2783203125, 667.8831787109375, 54.6695556640625, 4.263393402099609375, 0.083071708679199218, -0.0742959976196289, -0.84326362609863281, 0.525819003582000732, 7200, 255, 1, "", 46248, NULL), +(32058, 148864, 129, 0, 0, 1, 1, 2455.52294921875, 698.8524169921875, 55.83034515380859375, 4.263393402099609375, 0.083071708679199218, -0.0742959976196289, -0.84326362609863281, 0.525819003582000732, 7200, 255, 1, "", 46248, NULL), +(32061, 148862, 129, 0, 0, 1, 1, 2459.827392578125, 641.6395263671875, 55.66199111938476562, 4.263393402099609375, 0.083071708679199218, -0.0742959976196289, -0.84326362609863281, 0.525819003582000732, 7200, 255, 1, "", 53622, NULL), +(32063, 148863, 129, 0, 0, 1, 1, 2433.279296875, 653.9517822265625, 55.74535751342773437, 4.263393402099609375, 0.083071708679199218, -0.0742959976196289, -0.84326362609863281, 0.525819003582000732, 7200, 255, 1, "", 53622, NULL), +(32065, 40199, 129, 0, 0, 1, 1, 2394.63330078125, 886.0281982421875, 55.44991683959960937, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35667, 40200, 129, 0, 0, 1, 1, 2399.799560546875, 893.102783203125, 39.14395904541015625, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35670, 148843, 129, 0, 0, 1, 1, 2436.9892578125, 1058.6173095703125, 59.6726226806640625, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35672, 148844, 129, 0, 0, 1, 1, 2427.52880859375, 1051.7711181640625, 40.94340896606445312, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35674, 148845, 129, 0, 0, 1, 1, 2416.9873046875, 1032.8013916015625, 39.0778961181640625, 3.135448217391967773, -0.02426767349243164, -0.07942390441894531, 0.996544837951660156, 0.001145121059380471, 7200, 255, 1, "", 49345, NULL), +(35676, 148857, 129, 0, 0, 1, 1, 2312.427001953125, 989.6822509765625, 58.81158065795898437, 2.539447784423828125, 0, 0, 0.955018997192382812, 0.296544641256332397, 7200, 255, 1, "", 49345, NULL), +(35678, 40201, 129, 0, 0, 1, 1, 2361.75537109375, 965.1715087890625, 39.82595062255859375, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35680, 148856, 129, 0, 0, 1, 1, 2323.65380859375, 1008.86614990234375, 51.92766952514648437, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35683, 148851, 129, 0, 0, 1, 1, 2358.816162109375, 903.6749267578125, 28.79062652587890625, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35685, 148853, 129, 0, 0, 1, 1, 2341.900146484375, 902.6148681640625, 54.869659423828125, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35687, 148854, 129, 0, 0, 1, 1, 2328.16455078125, 922.9345703125, 51.74258041381835937, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35689, 148855, 129, 0, 0, 1, 1, 2325.30029296875, 908.66790771484375, 58.56633377075195312, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(35691, 148852, 129, 0, 0, 1, 1, 2360.85888671875, 889.03338623046875, 60.68649673461914062, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 49345, NULL), +(4550, 176517, 1, 0, 0, 1, 1, 1664.6942138671875, -4204.3447265625, 56.48777008056640625, 0.026179106906056404, 0, 0, 0.013089179992675781, 0.999914348125457763, 120, 255, 1, "", 45435, NULL), +(56158, 179121, 469, 0, 0, 1, 1, -7683.7099609375, -1052.77734375, 440.64312744140625, 3.752462387084960937, 0, 0, -0.95371627807617187, 0.300707906484603881, 7200, 255, 1, "", 49345, NULL), +(56159, 179122, 469, 0, 0, 1, 1, -7691.453125, -1040.2327880859375, 440.68511962890625, 3.752462387084960937, 0, 0, -0.95371627807617187, 0.300707906484603881, 7200, 255, 1, "", 49345, NULL), +(57632, 191300, 571, 0, 0, 1, 1, 4896.09814453125, -4809.2607421875, 32.180419921875, 5.558874130249023437, 0, 0, -0.35429096221923828, 0.935135245323181152, 120, 255, 1, "", 47720, NULL), +(59127, 191865, 571, 0, 0, 1, 1, 4379.705078125, 1641.0352783203125, 131.157073974609375, 0, 0, 0, 0, 1, 120, 255, 1, "", 46158, NULL), +(59660, 192156, 571, 0, 0, 1, 1, 3191.7275390625, 1482.1041259765625, 150.7798004150390625, 2.679079532623291015, 0, 0, 0.973379135131835937, 0.229200854897499084, 120, 255, 1, "", 46158, NULL), +(59667, 192157, 571, 0, 0, 1, 1, 3150.865966796875, 1500.52197265625, 150.995697021484375, 2.975770950317382812, 0, 0, 0.996564865112304687, 0.082815870642662048, 120, 255, 1, "", 46158, NULL), +(59676, 192158, 571, 0, 0, 1, 1, 3074.512939453125, 1594.5965576171875, 156.2361907958984375, 2.871063947677612304, 0, 0, 0.990865707397460937, 0.134852290153503417, 120, 255, 1, "", 46158, NULL), +(60118, 186555, 571, 0, 0, 1, 1, 2443.6650390625, -5184.6162109375, 277.48974609375, 3.132858037948608398, 0, 0, 0.999990463256835937, 0.004367320332676172, 120, 255, 1, "", 46158, NULL), +(60242, 188605, 571, 0, 0, 1, 1, 2743.63623046875, 910.14410400390625, 6.246212959289550781, 0.383971005678176879, 0, 0, 0.190808296203613281, 0.981627285480499267, 120, 255, 1, "", 45854, NULL), +(61165, 192159, 571, 0, 0, 1, 1, 2918.35205078125, 1508.7781982421875, 155.4783172607421875, 2.853604078292846679, 0, 0, 0.989650726318359375, 0.143497169017791748, 120, 255, 1, "", 46158, NULL), +(61224, 192160, 571, 0, 0, 1, 1, 2905.341796875, 1462.214599609375, 155.4783172607421875, 2.809975385665893554, 0, 0, 0.986285209655761718, 0.165049895644187927, 120, 255, 1, "", 46158, NULL), +(67189, 191862, 571, 0, 0, 1, 1, 4401.0771484375, 1689.473876953125, 141.15924072265625, 1.343903779983520507, 0, 0, 0.622514724731445312, 0.782608091831207275, 120, 255, 1, "", 46158, NULL), +(67197, 191866, 571, 0, 0, 1, 1, 4408.02734375, 1681.6822509765625, 131.157073974609375, 0, 0, 0, 0, 1, 120, 255, 1, "", 46158, NULL), +(67200, 191867, 571, 0, 0, 1, 1, 4360.34521484375, 1683.43994140625, 131.157073974609375, 0, 0, 0, 0, 1, 120, 255, 1, "", 46158, NULL), +(67203, 191869, 571, 0, 0, 1, 1, 4497.3125, 1828.2781982421875, 165.3346099853515625, 2.076939344406127929, 0, 0, 0.861628532409667968, 0.50753939151763916, 120, 255, 1, "", 46158, NULL), +(67205, 191870, 571, 0, 0, 1, 1, 4424.82763671875, 1791.14697265625, 163.973175048828125, 2.076939344406127929, 0, 0, 0.861628532409667968, 0.50753939151763916, 120, 255, 1, "", 46158, NULL), +(67207, 191871, 571, 0, 0, 1, 1, 4509.00048828125, 1900.95556640625, 163.288604736328125, 3.769911527633666992, 0, 0, -0.95105648040771484, 0.309017121791839599, 120, 255, 1, "", 46158, NULL), +(67211, 191873, 571, 0, 0, 1, 1, 4440.63623046875, 1835.3541259765625, 163.5031280517578125, 2.076939344406127929, 0, 0, 0.861628532409667968, 0.50753939151763916, 120, 255, 1, "", 46158, NULL), +(67213, 191874, 571, 0, 0, 1, 1, 4430.98388671875, 1842.3822021484375, 163.288604736328125, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 46158, NULL), +(67215, 191875, 571, 0, 0, 1, 1, 4434.5615234375, 1769.09326171875, 163.288604736328125, 0.689404308795928955, 0, 0, 0.337916374206542968, 0.941176116466522216, 120, 255, 1, "", 46158, NULL), +(67217, 191876, 571, 0, 0, 1, 1, 4535.181640625, 1772.4954833984375, 163.288604736328125, 2.583087682723999023, 0, 0, 0.961261749267578125, 0.275637149810791015, 120, 255, 1, "", 46158, NULL), +(7039, 176518, 1, 0, 0, 1, 1, 1666.9158935546875, -4213.373046875, 56.48777008056640625, 5.593780994415283203, 0, 0, -0.33791637420654296, 0.941176116466522216, 120, 255, 1, "", 45435, NULL), +(87863, 136950, 229, 0, 0, 1, 1, 72.83731842041015625, -265.629638671875, 60.7364501953125, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87864, 136952, 229, 0, 0, 1, 1, 69.97309112548828125, -329.867767333984375, 55.87213516235351562, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87865, 136955, 229, 0, 0, 1, 1, 56.36406326293945312, -306.15814208984375, 54.01570892333984375, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87867, 176460, 229, 0, 0, 1, 1, 70.543548583984375, -257.1690673828125, 60.74013900756835937, 3.124123096466064453, 0, 0, 0.99996185302734375, 0.008734640665352344, 7200, 255, 1, "", 47720, NULL), +(87895, 136947, 229, 0, 0, 1, 1, 16.99366569519042968, -253.820968627929687, 65.4497528076171875, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87896, 136948, 229, 0, 0, 1, 1, 8.170413970947265625, -268.98040771484375, 65.4497528076171875, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87897, 136949, 229, 0, 0, 1, 1, 51.24510574340820312, -274.132843017578125, 65.4497528076171875, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87898, 136951, 229, 0, 0, 1, 1, 68.88016510009765625, -283.79351806640625, 60.7364501953125, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87953, 176427, 229, 0, 0, 1, 1, 53.19210052490234375, -461.06982421875, 24.38974380493164062, 3.141685962677001953, 0.029564857482910156, -0.00157070159912109, -0.99956130981445312, 0, 7200, 255, 1, "", 47720, NULL), +(87954, 176428, 229, 0, 0, 1, 1, -63.2567787170410156, -581.48291015625, 29.29336929321289062, 3.141685962677001953, 0.029564857482910156, -0.00157070159912109, -0.99956130981445312, 0, 7200, 255, 1, "", 50375, NULL), +(87955, 176429, 229, 0, 0, 1, 1, -37.6862525939941406, -551.82208251953125, 16.21634483337402343, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87956, 176430, 229, 0, 0, 1, 1, -25.3348827362060546, -478.438262939453125, 17.25037574768066406, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87957, 176431, 229, 0, 0, 1, 1, -46.3864631652832031, -448.609954833984375, -18.5644283294677734, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 50375, NULL), +(87958, 176432, 229, 0, 0, 1, 1, -2.64241647720336914, -579.1436767578125, -18.7608661651611328, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87959, 176433, 229, 0, 0, 1, 1, 26.98200035095214843, -583.365234375, -18.5152549743652343, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87960, 176434, 229, 0, 0, 1, 1, 35.64240264892578125, -550.7298583984375, -18.410959243774414, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87961, 176435, 229, 0, 0, 1, 1, 33.16426467895507812, -471.046875, -18.5059146881103515, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 47720, NULL), +(87963, 176437, 229, 0, 0, 1, 1, -39.3852005004882812, -424.878204345703125, -18.8470706939697265, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 50375, NULL), +(87966, 176440, 229, 0, 0, 1, 1, -59.9712257385253906, -409.641204833984375, -18.8442916870117187, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 50375, NULL), +(87967, 176441, 229, 0, 0, 1, 1, -79.5308761596679687, -453.927215576171875, -18.8331813812255859, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 50375, NULL), +(87969, 176443, 229, 0, 0, 1, 1, -121.137336730957031, -296.445465087890625, 71.039703369140625, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 50375, NULL), +(87972, 176446, 229, 0, 0, 1, 1, -87.3357009887695312, -348.370025634765625, 71.039703369140625, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 50375, NULL), +(87976, 176457, 229, 0, 0, 1, 1, -115.2733154296875, -428.517547607421875, -18.7010059356689453, 3.141592741012573242, 0, 0, -1, 0, 7200, 255, 1, "", 50375, NULL); + +-- remaining spawns (no sniffed values available) +-- (`guid` IN (32048)) + +-- new spawns +DELETE FROM `gameobject` WHERE (`id` IN (165587, 179119, 179120)) +AND (`guid` BETWEEN 12373 AND 12375); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(12373, 165587, 0, 0, 0, 1, 1, 1431.332275390625, -2809.98095703125, -59.7744903564453125, 3.621558189392089843, 0, 0, -0.97134208679199218, 0.237685784697532653, 120, 255, 1, "", 49345, NULL), +(12374, 179119, 469, 0, 0, 1, 1, -7579.63232421875, -912.66131591796875, 428.38397216796875, 3.752462387084960937, 0, 0, -0.95371627807617187, 0.300707906484603881, 7200, 255, 1, "", 49345, NULL), +(12375, 179120, 469, 0, 0, 1, 1, -7592.7822265625, -921.29632568359375, 428.42596435546875, 3.752462387084960937, 0, 0, -0.95371627807617187, 0.300707906484603881, 7200, 255, 1, "", 49345, NULL); From c8d4b921a6588506dc30229e1083274033e778ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 19 Apr 2024 10:21:39 +0000 Subject: [PATCH 06/20] chore(DB): import pending files Referenced commit(s): c6cc88240fc2d33c5ffaf459ed02c22335134d78 --- .../rev_1711310669959067500.sql => db_world/2024_04_19_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1711310669959067500.sql => db_world/2024_04_19_00.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1711310669959067500.sql b/data/sql/updates/db_world/2024_04_19_00.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1711310669959067500.sql rename to data/sql/updates/db_world/2024_04_19_00.sql index 842947033..1c3b51cce 100644 --- a/data/sql/updates/pending_db_world/rev_1711310669959067500.sql +++ b/data/sql/updates/db_world/2024_04_19_00.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_18_00 -> 2024_04_19_00 -- Update gameobject 'Fire' with sniffed values -- updated spawns DELETE FROM `gameobject` WHERE (`id` IN (176519, 176516, 176520, 176521, 1766, 3084, 186075, 186076, 186082, 186069, 186068, 186077, 186078, 186055, 186054, 186079, 186058, 186062, 186081, 186053, 182864, 182865, 182866, 182994, 183005, 183006, 183007, 183008, 183009, 183010, 183431, 186080, 186072, 186064, 186049, 186050, 148850, 148858, 148847, 148849, 148848, 148861, 148860, 148846, 148859, 148864, 148862, 148863, 40199, 40200, 148843, 148844, 148845, 148857, 40201, 148856, 148851, 148853, 148854, 148855, 148852, 176517, 179121, 179122, 191300, 191865, 192156, 192157, 192158, 186555, 188605, 192159, 192160, 191862, 191866, 191867, 191869, 191870, 191871, 191873, 191874, 191875, 191876, 176518, 136950, 136952, 136955, 176460, 136947, 136948, 136949, 136951, 176427, 176428, 176429, 176430, 176431, 176432, 176433, 176434, 176435, 176437, 176440, 176441, 176443, 176446, 176457)) From 1c1c1f44c8e68e5d7db698ca27f1daa6f0571901 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:20:01 -0300 Subject: [PATCH 07/20] chore(DB/Creature): worldserver error (#18765) Create rev_1713534008677560300.sql --- data/sql/updates/pending_db_world/rev_1713534008677560300.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713534008677560300.sql diff --git a/data/sql/updates/pending_db_world/rev_1713534008677560300.sql b/data/sql/updates/pending_db_world/rev_1713534008677560300.sql new file mode 100644 index 000000000..52dd610cf --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713534008677560300.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `creature_template_spell` WHERE `CreatureID` = 17899 AND `Index` = 0; From c738f0d67c4ee5b0464975db7cbc70e98e22d7bf Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Sat, 20 Apr 2024 03:20:24 +0200 Subject: [PATCH 08/20] fix(Scripts/Hyjal): Cannibalize should heal more than 1 (#18766) * init * include SpellScript.h --- .../rev_1713549415418061715.sql | 3 +++ .../BattleForMountHyjal/hyjal.cpp | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713549415418061715.sql diff --git a/data/sql/updates/pending_db_world/rev_1713549415418061715.sql b/data/sql/updates/pending_db_world/rev_1713549415418061715.sql new file mode 100644 index 000000000..251091315 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713549415418061715.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `spell_script_names` WHERE `spell_id` = 31538; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (31538, 'spell_cannibalize_heal'); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 49d5b34cd..a5c7c4e0b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -19,6 +19,8 @@ #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" +#include "SpellScript.h" +#include "SpellScriptLoader.h" #include "hyjal.h" enum Spells @@ -327,6 +329,26 @@ public: }; +// 31538 - Cannibalize (Heal) +class spell_cannibalize_heal : public SpellScript +{ + PrepareSpellScript(spell_cannibalize_heal); + + void HandleHeal(SpellEffIndex /*effIndex*/) + { + if (Unit* caster = GetCaster()) + { + uint32 heal = caster->CountPctFromMaxHealth(7); + SetHitHeal(heal); + } + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_cannibalize_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + } +}; + struct npc_hyjal_ground_trash : public ScriptedAI { npc_hyjal_ground_trash(Creature* creature) : ScriptedAI(creature) @@ -704,4 +726,5 @@ void AddSC_hyjal() RegisterHyjalAI(npc_hyjal_ground_trash); RegisterHyjalAI(npc_hyjal_gargoyle); RegisterHyjalAI(npc_hyjal_frost_wyrm); + RegisterSpellScript(spell_cannibalize_heal); } From 061d414e1c0dfc3fb98c13ff7e8ea6bf0e1b081a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 20 Apr 2024 01:20:52 +0000 Subject: [PATCH 09/20] chore(DB): import pending files Referenced commit(s): 1c1c1f44c8e68e5d7db698ca27f1daa6f0571901 --- .../rev_1713534008677560300.sql => db_world/2024_04_20_00.sql} | 1 + .../rev_1713549415418061715.sql => db_world/2024_04_20_01.sql} | 1 + 2 files changed, 2 insertions(+) rename data/sql/updates/{pending_db_world/rev_1713534008677560300.sql => db_world/2024_04_20_00.sql} (65%) rename data/sql/updates/{pending_db_world/rev_1713549415418061715.sql => db_world/2024_04_20_01.sql} (78%) diff --git a/data/sql/updates/pending_db_world/rev_1713534008677560300.sql b/data/sql/updates/db_world/2024_04_20_00.sql similarity index 65% rename from data/sql/updates/pending_db_world/rev_1713534008677560300.sql rename to data/sql/updates/db_world/2024_04_20_00.sql index 52dd610cf..535d604d7 100644 --- a/data/sql/updates/pending_db_world/rev_1713534008677560300.sql +++ b/data/sql/updates/db_world/2024_04_20_00.sql @@ -1,2 +1,3 @@ +-- DB update 2024_04_19_00 -> 2024_04_20_00 -- DELETE FROM `creature_template_spell` WHERE `CreatureID` = 17899 AND `Index` = 0; diff --git a/data/sql/updates/pending_db_world/rev_1713549415418061715.sql b/data/sql/updates/db_world/2024_04_20_01.sql similarity index 78% rename from data/sql/updates/pending_db_world/rev_1713549415418061715.sql rename to data/sql/updates/db_world/2024_04_20_01.sql index 251091315..0ead4183d 100644 --- a/data/sql/updates/pending_db_world/rev_1713549415418061715.sql +++ b/data/sql/updates/db_world/2024_04_20_01.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_20_00 -> 2024_04_20_01 -- DELETE FROM `spell_script_names` WHERE `spell_id` = 31538; INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (31538, 'spell_cannibalize_heal'); From 3176615a1d78bcca1e55b8594c0d9a7e3dea00d5 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 21 Apr 2024 21:55:05 +0200 Subject: [PATCH 10/20] fix(DB/SAI): make 'Midsummer Celebrants' talk regularly (#18770) --- data/sql/updates/pending_db_world/rev_1713615045654319800.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713615045654319800.sql diff --git a/data/sql/updates/pending_db_world/rev_1713615045654319800.sql b/data/sql/updates/pending_db_world/rev_1713615045654319800.sql new file mode 100644 index 000000000..7ef10cce6 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713615045654319800.sql @@ -0,0 +1,4 @@ +-- make 'Midsummer Celebrants' talk regularly +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 16781) AND (`source_type` = 0) AND (`id` IN (2)); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(16781, 0, 2, 0, 1, 0, 100, 0, 10000, 60000, 10000, 60000, 0, 0, 5, 396, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Midsummer Celebrant - Out of Combat - Play Emote 396'); From 62851d5a129fef5c63038ab279b546ae3b364523 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 21 Apr 2024 21:55:30 +0200 Subject: [PATCH 11/20] fix(DB/Gameobject): Sniffed Values for '%Cauldron%' spawns (#18762) * fix(DB/Gameobject): Sniffed Values for '%Cauldron%' spawns * drop map 30 spawn --- .../rev_1713467863396026800.sql | 146 ++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713467863396026800.sql diff --git a/data/sql/updates/pending_db_world/rev_1713467863396026800.sql b/data/sql/updates/pending_db_world/rev_1713467863396026800.sql new file mode 100644 index 000000000..d4ab51a4d --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713467863396026800.sql @@ -0,0 +1,146 @@ +-- Update gameobject '%Cauldron%' with sniffed values +-- updated spawns +DELETE FROM `gameobject` WHERE (`id` IN (157969, 2719, 142690, 59850, 142693, 20877, 18342, 18345, 18341, 18340, 36396, 148511, 153220, 18084, 20878, 176574, 176559, 31580, 160421, 3266, 103772, 18083, 141845, 149029, 18079, 142118, 181445, 182575, 183827, 183895, 183922, 183923, 183924, 183925, 183926, 183927, 183930, 183931, 184003, 184355, 184370, 184373, 184472, 184475, 184715, 185180, 185283, 185289, 141851, 181322, 181315, 3315, 179704, 92099, 20870, 20871, 103663, 89931, 20872, 187879, 59530, 59529, 74078, 74075, 74076, 176899, 178524, 178572, 178573, 160470, 177284, 177285, 177286, 176393, 177289, 176392, 176361, 20970, 176273, 176275, 20869, 177244, 176091, 32879, 32880, 153124, 153125, 176278, 176284, 153576, 153577, 153579, 175984, 186656, 190021, 188495, 188246, 188248, 190618, 190619, 190620, 190630, 187690, 192916, 190936, 190937, 187714, 2076, 186451, 181327)) +AND (`guid` IN (10195, 10215, 10652, 10787, 10831, 10833, 11637, 11771, 11772, 11832, 12349, 12450, 12452, 1358, 13768, 13981, 13987, 1425, 14678, 15118, 15482, 1632, 17263, 17273, 1733, 18130, 21761, 23180, 24692, 24746, 24773, 24774, 24775, 24776, 24777, 24778, 24779, 24780, 24865, 25154, 25171, 25174, 25336, 25338, 25527, 26040, 26161, 26167, 27124, 27291, 27366, 27887, 28656, 29558, 30087, 30091, 30095, 30099, 30118, 356, 35622, 35657, 35707, 35731, 35744, 391, 406, 42489, 42500, 42586, 44778, 44780, 45306, 45312, 45318, 45319, 45324, 45601, 45604, 45618, 46457, 47957, 48871, 49697, 49700, 49942, 49944, 50060, 50071, 50176, 50185, 50188, 50454, 56551, 57636, 57887, 58028, 58077, 59649, 59656, 59663, 59778, 60087, 60109, 60124, 61034, 62571, 66376, 66377, 67467, 6783, 7569, 9667)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(10195, 157969, 0, 0, 0, 1, 1, -11406.181640625, -796.03668212890625, 14.95203781127929687, 0.619591057300567626, 0, 0, 0.304863929748535156, 0.952395915985107421, 120, 255, 1, "", 46902, NULL), +(10215, 2719, 0, 0, 0, 1, 1, -7045.55908203125, -3637.40966796875, 241.6666717529296875, 3.394901275634765625, 0, 0, -0.9919900894165039, 0.126315817236900329, 120, 255, 1, "", 48120, NULL), +(10652, 142690, 0, 0, 0, 1, 1, -6272.8603515625, -3745.03955078125, 244.00347900390625, 3.14153456687927246, 0.026151657104492187, -0.04360389709472656, 0.998705863952636718, 0.001170857343822717, 120, 255, 1, "", 50664, NULL), +(10787, 59850, 0, 0, 0, 1, 1, -14478.34765625, 431.756195068359375, 36.19657135009765625, 0.837755441665649414, 0, 0, 0.406735420227050781, 0.91354602575302124, 120, 255, 1, "", 45572, NULL), +(10831, 142693, 0, 0, 0, 1, 1, -6767.74755859375, -3136.1806640625, 240.5193939208984375, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45613, NULL), +(10833, 20877, 0, 0, 0, 1, 1, -5663.10888671875, -1566.8819580078125, 383.203582763671875, 4.967469215393066406, 0, 0, -0.61142349243164062, 0.791303575038909912, 120, 255, 1, "", 46368, NULL), +(11637, 18342, 0, 0, 0, 1, 1, -4840.22900390625, -4040.982666015625, 315.271240234375, 1.682155609130859375, 0.019510746002197265, -0.01745033264160156, 0.745106697082519531, 0.666431427001953125, 120, 255, 1, "", 48120, NULL), +(11771, 18345, 0, 0, 0, 1, 1, -6039.69775390625, -2985.59619140625, 401.95147705078125, 3.140588760375976562, 0.121858596801757812, -0.01299190521240234, 0.992460250854492187, 0.002085938351228833, 120, 255, 1, "", 50664, NULL), +(11772, 18341, 0, 0, 0, 1, 1, -5275.478515625, -2706.68798828125, 342.64849853515625, 3.140599012374877929, 0.013023853302001953, -0.10017871856689453, 0.994882583618164062, 0.001810595276765525, 120, 255, 1, "", 47720, NULL), +(11832, 18340, 0, 0, 0, 1, 1, -5049.2294921875, -2679.08251953125, 319.50946044921875, 0.825179338455200195, 0.039958953857421875, 0.017490386962890625, 0.400601387023925781, 0.915213584899902343, 120, 255, 1, "", 47720, NULL), +(12349, 36396, 0, 0, 0, 1, 1, -11306.451171875, -3404.673583984375, 7.467741966247558593, 3.586656570434570312, 0, 0, -0.975341796875, 0.220699742436408996, 120, 255, 1, "", 45772, NULL), +(12450, 148511, 0, 0, 0, 1, 1, -11044.8427734375, -3386.478759765625, 65.37012481689453125, 2.83248138427734375, 0, 0, 0.988080024719238281, 0.153941065073013305, 120, 255, 1, "", 46248, NULL), +(12452, 153220, 0, 0, 0, 1, 1, -11524.3017578125, -2852.418701171875, 7.3902130126953125, 3.142735719680786132, -0.01741981506347656, -0.06103897094726562, -0.99798202514648437, 0.001637745066545903, 120, 255, 1, "", 45772, NULL), +(1358, 18084, 1, 0, 0, 1, 1, -1265.079833984375, -5510.94970703125, 5.25556802749633789, 3.140863418579101562, -0.04796171188354492, 0.026146888732910156, 0.998505592346191406, 0.001619445742107927, 120, 255, 1, "", 45435, NULL), +(13768, 20878, 0, 0, 0, 1, 1, -3899.458251953125, -3033.807373046875, 11.03367328643798828, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 48632, NULL), +(13981, 176574, 0, 0, 0, 1, 1, -10802.025390625, -2192.3349609375, 117.13134765625, 6.237643718719482421, 0, 0, -0.02276897430419921, 0.99974071979522705, 120, 255, 1, "", 48632, NULL), +(13987, 176559, 0, 0, 0, 1, 1, -11003.669921875, -2307.094482421875, 117.1313934326171875, 2.460005044937133789, 0, 0, 0.9424896240234375, 0.334235370159149169, 120, 255, 1, "", 48632, NULL), +(1425, 31580, 1, 0, 0, 1, 1, 351.649322509765625, -4854.58349609375, 10.41963672637939453, 3.124123096466064453, 0, 0, 0.99996185302734375, 0.008734640665352344, 120, 255, 1, "", 45435, NULL), +(14678, 160421, 1, 0, 0, 1, 1, -1639.1549072265625, -4382.7197265625, 17.82378768920898437, 5.611233234405517578, 0, 0, -0.32969093322753906, 0.944088935852050781, 120, 255, 1, "", 50664, NULL), +(15118, 3266, 1, 0, 0, 1, 1, -4152.30712890625, -2193.78125, 50.18310546875, 3.176533222198486328, 0, 0, -0.999847412109375, 0.017469281330704689, 120, 255, 1, "", 45572, NULL), +(15482, 103772, 0, 0, 0, 1, 1, -2076.958251953125, -2135.189208984375, 21.12221717834472656, 3.080478668212890625, 0.022465705871582031, 0.021132469177246093, 0.999072074890136718, 0.030062029138207435, 120, 255, 1, "", 47168, NULL), +(1632, 18083, 1, 0, 0, 1, 1, -557.6788330078125, -4219.20849609375, 41.59037017822265625, 3.115344762802124023, 0.004419803619384765, 0.004305839538574218, 0.999895095825195312, 0.01310423482209444, 120, 255, 1, "", 45327, NULL), +(17263, 141845, 1, 0, 0, 1, 1, -7403.830078125, -4585.26904296875, 8.876789093017578125, 0.231924712657928466, 0, 0, 0.115702629089355468, 0.99328392744064331, 120, 255, 1, "", 45772, NULL), +(17273, 149029, 1, 0, 0, 1, 1, -8499.142578125, -3036.317626953125, 8.977961540222167968, 2.95832991600036621, 0, 0, 0.995804786682128906, 0.091503240168094635, 120, 255, 1, "", 45772, NULL), +(1733, 18079, 1, 0, 0, 1, 1, 313.71966552734375, -4661.78759765625, 16.12734413146972656, 3.176556825637817382, -0.03466272354125976, -0.0136871337890625, -0.99914455413818359, 0.017925642430782318, 120, 255, 1, "", 45327, NULL), +(18130, 142118, 1, 0, 0, 1, 1, -2934.614501953125, -1273.0382080078125, 72.20438385009765625, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 46158, NULL), +(21761, 181445, 530, 0, 0, 1, 1, 8679.9814453125, -7932.3349609375, 152.9143829345703125, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45942, NULL), +(23180, 182575, 530, 0, 0, 1, 1, 1241.857666015625, 8493.8974609375, 23.134521484375, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(24692, 183827, 530, 0, 0, 1, 1, -2552.796875, 5449.93505859375, 0.064805001020431518, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45704, NULL), +(24746, 183895, 530, 0, 0, 1, 1, -2668.02783203125, 4369.15478515625, 36.00443649291992187, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45704, NULL), +(24773, 183922, 530, 0, 0, 1, 1, -2680.010498046875, 4459.10791015625, 36.1190185546875, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45704, NULL), +(24774, 183923, 530, 0, 0, 1, 1, 2662.958251953125, 6482.1162109375, 3.469566106796264648, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45704, NULL), +(24775, 183924, 530, 0, 0, 1, 1, 2523.116455078125, 6686.43505859375, 3.497148990631103515, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(24776, 183925, 530, 0, 0, 1, 1, 2356.44970703125, 6528.1015625, 3.46956801414489746, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45704, NULL), +(24777, 183926, 530, 0, 0, 1, 1, 2324.890625, 6711.6787109375, 17.086578369140625, 0.038830336183309555, 0, 0, 0.019413948059082031, 0.999811530113220214, 120, 255, 1, "", 45854, NULL), +(24778, 183927, 530, 0, 0, 1, 1, 1694.9271240234375, 6254.49853515625, 2.065490007400512695, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45942, NULL), +(24779, 183930, 530, 0, 0, 1, 1, 2356.87158203125, 7293.8193359375, 365.956787109375, 4.180065631866455078, 0, 0, -0.86819839477539062, 0.496217250823974609, 120, 255, 1, "", 45942, NULL), +(24780, 183931, 530, 0, 0, 1, 1, 1562.8160400390625, 6302.51904296875, 3.88653111457824707, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(24865, 184003, 530, 0, 0, 1, 1, 3665.8447265625, 6573.25244140625, 133.989410400390625, 1.343903779983520507, 0, 0, 0.622514724731445312, 0.782608091831207275, 120, 255, 1, "", 45942, NULL), +(25154, 184355, 530, 0, 0, 1, 1, 3238.96533203125, 5887.25537109375, -2.27546000480651855, 4.712389945983886718, 0.037006855010986328, 0.012340545654296875, -0.70699882507324218, 0.70613795518875122, 120, 255, 1, "", 45854, NULL), +(25171, 184370, 530, 0, 0, 1, 1, 3634.247314453125, 5249.26318359375, -18.2547931671142578, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(25174, 184373, 530, 0, 0, 1, 1, 3595.4453125, 5306.26025390625, -22.1728897094726562, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(25336, 184472, 530, 0, 0, 1, 1, 3213.538330078125, 5690.23193359375, -0.49235498905181884, 5.977754592895507812, 0, 0, -0.15212249755859375, 0.988361656665802001, 120, 255, 1, "", 45854, NULL), +(25338, 184475, 530, 0, 0, 1, 1, 3078.55908203125, 5863.0224609375, -0.02667200006544589, 5.742135047912597656, 0, 0, -0.26723766326904296, 0.96363067626953125, 120, 255, 1, "", 45854, NULL), +(25527, 184715, 530, 0, 0, 1, 1, -970.8125, 2172, 15.54283618927001953, 3.94444584846496582, 0, 0, -0.92050457000732421, 0.3907318115234375, 120, 255, 1, "", 45854, NULL), +(26040, 185180, 530, 0, 0, 1, 1, -1335.775390625, 2353.9306640625, 88.95517730712890625, 4.188792228698730468, 0, 0, -0.86602497100830078, 0.50000077486038208, 120, 255, 1, "", 45704, NULL), +(26161, 185283, 530, 0, 0, 1, 1, 2438.109375, 5737.91162109375, 272.2042236328125, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(26167, 185289, 530, 0, 0, 1, 1, 2292.677001953125, 5757.18408203125, 269.552947998046875, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(27124, 141851, 209, 0, 0, 1, 1, 1909.48095703125, 1016.12677001953125, 11.51571846008300781, 2.792518377304077148, 0, 0, 0.984807014465332031, 0.173652306199073791, 7200, 255, 1, "", 49345, NULL), +(27291, 181322, 530, 0, 0, 1, 1, 7351.884765625, -7816.40283203125, 148.0069580078125, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45942, NULL), +(27366, 181315, 530, 0, 0, 1, 1, 7645.99560546875, -7176.19091796875, 152.6761016845703125, 3.167797565460205078, 0, 0, -0.99991416931152343, 0.013101960532367229, 120, 255, 1, "", 45942, NULL), +(27887, 3315, 1, 0, 0, 1, 1, -1221.873779296875, -18.0720767974853515, 165.411224365234375, 3.115387916564941406, 0, 0, 0.999914169311523437, 0.013101960532367229, 120, 255, 1, "", 45435, NULL), +(28656, 179704, 309, 0, 0, 1, 1, -11548.8330078125, -1247.9774169921875, 78.28408050537109375, 3.9793548583984375, 0, 0, -0.9135446548461914, 0.406738430261611938, 7200, 255, 1, "", 48019, NULL), +(29558, 92099, 0, 0, 0, 1, 1, -9975.2314453125, -3654.420654296875, 21.69826698303222656, 2.661619186401367187, 0, 0, 0.971341133117675781, 0.237689673900604248, 120, 255, 1, "", 50664, NULL), +(30087, 20870, 0, 0, 0, 1, 1, 565.04864501953125, -277.395843505859375, 150.270782470703125, 6.146652698516845703, 0, 0, -0.06821346282958984, 0.997670710086822509, 120, 255, 1, "", 47168, NULL), +(30091, 20871, 0, 0, 0, 1, 1, 844.304931640625, -562.16192626953125, 141.905548095703125, 6.172833442687988281, 0, 0, -0.05514812469482421, 0.998478174209594726, 120, 255, 1, "", 46779, NULL), +(30095, 103663, 0, 0, 0, 1, 1, 253.0373077392578125, -1437.63916015625, 49.93048095703125, 3.708826541900634765, 0, 0, -0.96004962921142578, 0.279829770326614379, 120, 255, 1, "", 45613, NULL), +(30099, 89931, 0, 0, 0, 1, 1, 253.017364501953125, -1437.673583984375, 49.93165206909179687, 3.132858037948608398, 0, 0, 0.999990463256835937, 0.004367320332676172, 120, 255, 1, "", 45613, NULL), +(30118, 20872, 0, 0, 0, 1, 1, 681.5421142578125, -593.62762451171875, 162.83038330078125, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45572, NULL), +(356, 187879, 571, 0, 0, 1, 1, 4207.36572265625, 4056.893798828125, 91.6207733154296875, 2.792518377304077148, 0, 0, 0.984807014465332031, 0.173652306199073791, 120, 255, 1, "", 46158, NULL), +(35622, 59530, 43, 0, 0, 1, 1, -69.809722900390625, -34.2418174743652343, -60.2395973205566406, 2.3547821044921875, 0.015677928924560546, 0.03179931640625, 0.923059463500976562, 0.383019834756851196, 7200, 255, 1, "", 53622, NULL), +(35657, 59529, 43, 0, 0, 1, 1, -286.253326416015625, -234.953399658203125, -63.6185035705566406, 3.456212043762207031, 0.010311603546142578, -0.01148509979248046, -0.98755168914794921, 0.156535655260086059, 7200, 255, 1, "", 53622, NULL), +(35707, 74078, 47, 0, 0, 1, 1, 2110.673095703125, 1543.941162109375, 81.49785614013671875, 0.820303261280059814, 0, 0, 0.398748397827148437, 0.917060375213623046, 7200, 255, 1, "", 51943, NULL), +(35731, 74075, 47, 0, 0, 1, 1, 2158.471923828125, 1413.6708984375, 74.1120758056640625, 0.820303261280059814, 0, 0, 0.398748397827148437, 0.917060375213623046, 7200, 255, 1, "", 51943, NULL), +(35744, 74076, 47, 0, 0, 1, 1, 2137.147705078125, 1923.770751953125, 66.4821624755859375, 0.820303261280059814, 0, 0, 0.398748397827148437, 0.917060375213623046, 7200, 255, 1, "", 51943, NULL), +(391, 176899, 0, 0, 0, 1, 1, -8138.421875, -1569.8853759765625, 133.5192108154296875, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 47612, NULL), +(406, 178524, 0, 0, 0, 1, 1, -7496.9130859375, -2173.036376953125, 165.4713897705078125, 5.256274700164794921, 0, 0, -0.49118995666503906, 0.871052503585815429, 120, 255, 1, "", 45772, NULL), +(42489, 178572, 0, 0, 0, 1, 1, -9492.125, -1930.1129150390625, 78.73984527587890625, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45435, NULL), +(42500, 178573, 0, 0, 0, 1, 1, -9126.4912109375, -3231.55078125, 101.2188262939453125, 4.756025314331054687, -0.01012754440307617, 0.039875984191894531, -0.69037628173828125, 0.722279667854309082, 120, 255, 1, "", 48632, NULL), +(42586, 160470, 0, 0, 0, 1, 1, -9340.6962890625, -2297.04345703125, 71.59995269775390625, 3.063013076782226562, 0.013079643249511718, -0.00051307678222656, 0.999142646789550781, 0.039276301860809326, 120, 255, 1, "", 45435, NULL), +(44778, 177284, 0, 0, 0, 1, 1, 1659.44970703125, -732.3507080078125, 59.30325698852539062, 3.138877630233764648, 0, 0.052335739135742187, 0.998628616333007812, 0.001359317451715469, 120, 255, 1, "", 45613, NULL), +(44780, 177285, 0, 0, 0, 1, 1, 1750.3228759765625, -732.3680419921875, 59.94146728515625, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45613, NULL), +(45306, 177286, 0, 0, 0, 1, 1, 962.346923828125, -1413.729248046875, 67.18117523193359375, 4.406959056854248046, 0.016182899475097656, 0.044300079345703125, -0.80493831634521484, 0.591481149196624755, 120, 255, 1, "", 45854, NULL), +(45312, 176393, 0, 0, 0, 1, 1, 1485.84033203125, -1863.154541015625, 58.44161605834960937, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(45318, 177289, 0, 0, 0, 1, 1, 1878.8004150390625, -1568.9149169921875, 58.9334869384765625, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(45319, 176392, 0, 0, 0, 1, 1, 1690.46875, -2272.5625, 58.9361724853515625, 3.569205284118652343, -0.00945377349853515, 0.002411842346191406, -0.97719192504882812, 0.212133765220642089, 120, 255, 1, "", 45854, NULL), +(45324, 176361, 0, 0, 0, 1, 1, 1738.876708984375, -1184.9288330078125, 59.26894760131835937, 2.364918231964111328, 0, 0, 0.925539970397949218, 0.378649920225143432, 120, 255, 1, "", 45854, NULL), +(45601, 20970, 0, 0, 0, 1, 1, 2783.28466796875, -4814.7255859375, 80.58518218994140625, 3.141087770462036132, -0.0784468650817871, 0.017398834228515625, 0.99676513671875, 0.001619445742107927, 120, 255, 1, "", 45942, NULL), +(45604, 176273, 0, 0, 0, 1, 1, 2794.81689453125, -5585.4912109375, 161.77197265625, 2.469640254974365234, 0, 0, 0.944088935852050781, 0.329690933227539062, 120, 255, 1, "", 49345, NULL), +(45618, 176275, 0, 0, 0, 1, 1, 2609.157958984375, -5503.625, 158.0510406494140625, 3.141848087310791015, -0.04792261123657226, -0.04792213439941406, -0.99769783020019531, 0.002429168438538908, 120, 255, 1, "", 49345, NULL), +(46457, 20869, 0, 0, 0, 1, 1, 610.18231201171875, -427.19097900390625, 161.1328277587890625, 3.141554594039916992, 0.00436258316040039, 0.004362106323242187, -0.99998092651367187, 0, 120, 255, 1, "", 45572, NULL), +(47957, 177244, 1, 0, 0, 1, 1, 3349.37109375, 1013.63671875, 3.197114944458007812, 3.816494941711425781, 0, 0, -0.94360160827636718, 0.331083029508590698, 120, 255, 1, "", 45435, NULL), +(48871, 176091, 1, 0, 0, 1, 1, 6909.3271484375, -1820.1234130859375, 570.554931640625, 1.466075778007507324, 0, 0, 0.669130325317382812, 0.74314504861831665, 120, 255, 1, "", 45854, NULL), +(49697, 32879, 1, 0, 0, 1, 1, 10405.6162109375, 715.27911376953125, 1321.624267578125, 3.115387916564941406, 0, 0, 0.999914169311523437, 0.013101960532367229, 120, 255, 1, "", 46902, NULL), +(49700, 32880, 1, 0, 0, 1, 1, 9755.6806640625, 905.11285400390625, 1295.517333984375, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 46902, NULL), +(49942, 153124, 1, 0, 0, 1, 1, -5499.21875, 1197.7396240234375, 18.96612739562988281, 1.946041464805603027, 0.004910945892333984, 0.007212638854980468, 0.826558113098144531, 0.562783777713775634, 120, 255, 1, "", 45942, NULL), +(49944, 153125, 1, 0, 0, 1, 1, -5504.0556640625, 1197.6458740234375, 18.80996131896972656, 1.35262918472290039, -0.01361083984375, -0.01092338562011718, 0.625827789306640625, 0.779765963554382324, 120, 255, 1, "", 45942, NULL), +(50060, 176278, 1, 0, 0, 1, 1, -4599.15966796875, 1377.6285400390625, 107.1603927612304687, 0.750492870807647705, 0, 0, 0.366501808166503906, 0.930417299270629882, 120, 255, 1, "", 46248, NULL), +(50071, 176284, 1, 0, 0, 1, 1, -4414.02978515625, 1476.583740234375, 126.0102005004882812, 4.084071159362792968, 0, 0, -0.8910064697265625, 0.453990638256072998, 120, 255, 1, "", 46248, NULL), +(50176, 153576, 1, 0, 0, 1, 1, -3741.395751953125, 207.0902862548828125, 121.75433349609375, 3.097961187362670898, -0.03535795211791992, -0.02103424072265625, 0.998931884765625, 0.02103438414633274, 120, 255, 1, "", 50664, NULL), +(50185, 153577, 1, 0, 0, 1, 1, -3993.01220703125, -179.923614501953125, 139.4153289794921875, 3.115387916564941406, 0, 0, 0.999914169311523437, 0.013101960532367229, 120, 255, 1, "", 50664, NULL), +(50188, 153579, 1, 0, 0, 1, 1, -3661.646728515625, 260.977447509765625, 143.121185302734375, 3.115357398986816406, 0.021925926208496093, 0.008437156677246093, 0.999640464782714843, 0.01292332075536251, 120, 255, 1, "", 50664, NULL), +(50454, 175984, 1, 0, 0, 1, 1, 7510.90380859375, -1529.2379150390625, 156.67913818359375, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 54261, NULL), +(56551, 186656, 571, 0, 0, 1, 1, 434.97027587890625, -4640.9560546875, 245.910919189453125, 4.014260292053222656, 0, 0, -0.90630722045898437, 0.422619491815567016, 120, 255, 1, "", 45772, NULL), +(57636, 190021, 571, 0, 0, 1, 1, 1623.4444580078125, -4828.783203125, 126.450592041015625, 3.063024282455444335, 0, 0, 0.999228477478027343, 0.039274025708436965, 120, 255, 1, "", 46158, NULL), +(57887, 188495, 571, 0, 0, 1, 1, 4893.92431640625, 294.055572509765625, 131.0809173583984375, 1.343903779983520507, 0.002308845520019531, -0.13435077667236328, 0.609956741333007812, 0.780959248542785644, 120, 255, 1, "", 46158, NULL), +(58028, 188246, 571, 0, 0, 1, 1, 4560.39306640625, -4171.35791015625, 173.485137939453125, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 48632, NULL), +(58077, 188248, 571, 0, 0, 1, 1, 4547.66650390625, -4213.87841796875, 170.4960784912109375, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 47720, NULL), +(59649, 190618, 571, 0, 0, 1, 1, 5493.28125, -3456.926513671875, 350.32720947265625, 0.558503925800323486, 0, 0, 0.275636672973632812, 0.961261868476867675, 120, 255, 1, "", 46158, NULL), +(59656, 190619, 571, 0, 0, 1, 1, 5613.61376953125, -3476.75048828125, 350.326904296875, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 46158, NULL), +(59663, 190620, 571, 0, 0, 1, 1, 5581.158203125, -3535.220947265625, 350.326904296875, 5.550147056579589843, 0, 0, -0.358367919921875, 0.933580458164215087, 120, 255, 1, "", 46158, NULL), +(59778, 190630, 571, 0, 0, 1, 1, 5527.3017578125, -3380.555419921875, 350.326904296875, 0.750490784645080566, 0, 0, 0.3665008544921875, 0.93041771650314331, 120, 255, 1, "", 46158, NULL), +(60087, 187690, 571, 0, 0, 1, 1, 4022.256591796875, 3604.12548828125, 104.032501220703125, 5.84685373306274414, 0, 0, -0.21643924713134765, 0.976296067237854003, 120, 255, 1, "", 46158, NULL), +(60109, 187690, 571, 0, 0, 1, 1, 4125.6533203125, 3637.903564453125, 91.7763824462890625, 5.288348197937011718, 0, 0, -0.4771585464477539, 0.878817260265350341, 120, 255, 1, "", 46158, NULL), +(60124, 187690, 571, 0, 0, 1, 1, 3746.692626953125, 3519.831298828125, 69.34168243408203125, 4.328419685363769531, 0, 0, -0.82903671264648437, 0.559194147586822509, 120, 255, 1, "", 46158, NULL), +(61034, 187879, 571, 0, 0, 1, 1, 4356.13232421875, 4261.08154296875, 98.309539794921875, 6.195919513702392578, 0, 0, -0.04361915588378906, 0.999048233032226562, 120, 255, 1, "", 48632, NULL), +(62571, 192916, 571, 0, 0, 1, 1, 6705.7255859375, 3529.06884765625, 671.09417724609375, 4.398232460021972656, 0, 0, -0.80901622772216796, 0.587786316871643066, 120, 255, 1, "", 46368, NULL), +(66376, 190936, 609, 0, 0, 1, 4, 1993.154541015625, -5826.18408203125, 100.5062179565429687, 2.356194972991943359, 0, 0, 0.923879623413085937, 0.382683247327804565, 120, 255, 1, "", 50664, NULL), +(66377, 190937, 609, 0, 0, 1, 4, 1783.8404541015625, -5877.65185546875, 109.495758056640625, 3.700104713439941406, 0, 0, -0.96126079559326171, 0.275640487670898437, 120, 255, 1, "", 50664, NULL), +(67467, 187714, 595, 0, 0, 3, 1, 2306.792236328125, 1286.4755859375, 130.455230712890625, 3.016947269439697265, -0.0154275894165039, 0.115665435791015625, 0.991074562072753906, 0.064456820487976074, 7200, 255, 1, "", 46368, NULL), +(6783, 2076, 0, 0, 0, 1, 1, -12342.9033203125, 165.0902862548828125, 2.854399919509887695, 5.393068790435791015, -0.008056640625, 0.013510704040527343, -0.43035411834716796, 0.90252310037612915, 120, 255, 1, "", 45572, NULL), +(7569, 186451, 1, 0, 0, 1, 1, -3961.460205078125, -4983.7431640625, 2.522584915161132812, 2.687806606292724609, 0, 0, 0.974370002746582031, 0.224951311945915222, 120, 255, 1, "", 46779, NULL), +(9667, 181327, 530, 0, 0, 1, 1, 6610.27099609375, -7352.7568359375, 54.10820388793945312, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45942, NULL); + +-- new spawns +DELETE FROM `gameobject` WHERE (`id` IN (105173, 180414, 186174, 186175, 186176, 186178)) +AND (`guid` BETWEEN 23298 AND 23320); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(23298, 105173, 1, 0, 0, 1, 1, 2900.787353515625, 2465.590576171875, 138.2296905517578125, 0.750425219535827636, 0, 0, 0.3664703369140625, 0.930429697036743164, 120, 255, 1, "", 45572, NULL), +(23299, 180414, 530, 0, 0, 1, 1, -2626.611328125, 4458.65283203125, 36.0947418212890625, 5.044002056121826171, 0, 0, -0.58070278167724609, 0.814115643501281738, 120, 255, 1, "", 45942, NULL), +(23300, 180414, 530, 0, 0, 1, 1, -3907.744873046875, 2093.68603515625, 94.8126068115234375, 3.717553615570068359, 0, 0, -0.95881938934326171, 0.284016460180282592, 120, 255, 1, "", 46158, NULL), +(23301, 180414, 530, 0, 0, 1, 1, -3971.827392578125, 2234.385986328125, 101.9039535522460937, 2.426007747650146484, 0, 0, 0.936672210693359375, 0.350207358598709106, 120, 255, 1, "", 51943, NULL), +(23302, 180414, 530, 0, 0, 1, 1, -4056.014892578125, 2192.958251953125, 109.9213104248046875, 2.635444164276123046, 0, 0, 0.96814727783203125, 0.250381410121917724, 120, 255, 1, "", 51943, NULL), +(23303, 180414, 530, 0, 0, 1, 1, -602.4219970703125, 4110.81494140625, 89.87567901611328125, 1.047197580337524414, 0, 0, 0.5, 0.866025388240814208, 120, 255, 1, "", 45942, NULL), +(23304, 180414, 530, 0, 0, 1, 1, -604.7305908203125, 4180.52099609375, 64.1133270263671875, 5.270895957946777343, 0, 0, -0.48480892181396484, 0.87462007999420166, 120, 255, 1, "", 45942, NULL), +(23305, 180414, 530, 0, 0, 1, 1, 181.1303253173828125, 2611.92431640625, 87.28353118896484375, 6.213373661041259765, 0, 0, -0.03489875793457031, 0.999390840530395507, 120, 255, 1, "", 45942, NULL), +(23306, 180414, 530, 0, 0, 1, 1, 1947.9859619140625, 6887.91455078125, 161.843902587890625, 1.48352813720703125, 0, 0, 0.675589561462402343, 0.737277925014495849, 120, 255, 1, "", 51943, NULL), +(23307, 180414, 530, 0, 0, 1, 1, 2020.8543701171875, 6866.53369140625, 174.548431396484375, 4.328419685363769531, 0, 0, -0.82903671264648437, 0.559194147586822509, 120, 255, 1, "", 51943, NULL), +(23308, 180414, 530, 0, 0, 1, 1, 2051.811767578125, 4684.263671875, 150.06573486328125, 0.977383077144622802, 0, 0, 0.469470977783203125, 0.882947921752929687, 120, 255, 1, "", 45942, NULL), +(23309, 180414, 530, 0, 0, 1, 1, 2115.855712890625, 6760.3642578125, 166.03997802734375, 0.349065244197845458, 0, 0, 0.173647880554199218, 0.984807789325714111, 120, 255, 1, "", 51943, NULL), +(23310, 180414, 530, 0, 0, 1, 1, 212.0390625, 4357.51904296875, 120.3719635009765625, 5.201082706451416015, 0, 0, -0.51503753662109375, 0.857167601585388183, 120, 255, 1, "", 51943, NULL), +(23311, 180414, 530, 0, 0, 1, 1, 2266.48046875, 5996.30908203125, 142.7248382568359375, 5.742135047912597656, 0, 0, -0.26723766326904296, 0.96363067626953125, 120, 255, 1, "", 45942, NULL), +(23312, 180414, 530, 0, 0, 1, 1, 227.64898681640625, 2628.176025390625, 87.4365081787109375, 3.24634718894958496, 0, 0, -0.99862861633300781, 0.052353221923112869, 120, 255, 1, "", 45942, NULL), +(23313, 180414, 530, 0, 0, 1, 1, 2332.523681640625, 6017.34130859375, 142.4041748046875, 2.687806606292724609, 0, 0, 0.974370002746582031, 0.224951311945915222, 120, 255, 1, "", 45942, NULL), +(23314, 180414, 530, 0, 0, 1, 1, 2378.328857421875, 5941.94189453125, 151.9701690673828125, 2.321286916732788085, 0, 0, 0.917059898376464843, 0.398749500513076782, 120, 255, 1, "", 45942, NULL), +(23315, 180414, 530, 0, 0, 1, 1, 2436.930908203125, 5996.685546875, 153.7641448974609375, 4.97418975830078125, 0, 0, -0.60876083374023437, 0.793353796005249023, 120, 255, 1, "", 45942, NULL), +(23316, 180414, 530, 0, 0, 1, 1, 273.5987548828125, 2719.646484375, 86.63010406494140625, 1.448621988296508789, 0, 0, 0.662619590759277343, 0.748956084251403808, 120, 255, 1, "", 45942, NULL), +(23317, 186174, 530, 0, 0, 1, 1, -1374.55908203125, 9706.9833984375, 205.30621337890625, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 45854, NULL), +(23318, 186175, 530, 0, 0, 1, 1, -1456.9722900390625, 9855.896484375, 200.6370849609375, 3.150327444076538085, 0, 0, -0.99999046325683593, 0.004367320332676172, 120, 255, 1, "", 45854, NULL), +(23319, 186176, 530, 0, 0, 1, 1, -1547.623291015625, 9744.4033203125, 202.4515228271484375, 0.069811686873435974, 0, 0, 0.034898757934570312, 0.999390840530395507, 120, 255, 1, "", 45854, NULL), +(23320, 186178, 530, 0, 0, 1, 1, -1374.6441650390625, 9581.0634765625, 205.552154541015625, 0.881391823291778564, 0, 0, 0.426568984985351562, 0.904455006122589111, 120, 255, 1, "", 45854, NULL); From 1c61246994b8541f07933118f4dbf851f39e1fd8 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 21 Apr 2024 21:57:08 +0200 Subject: [PATCH 12/20] fix(DB/Gameobject): Sniffed Values for 179548 'A Dusty Tome' spawns (#18775) * fix(DB/Gameobject): Sniffed Values for 'A Dusty Tome' spawns * fix spawnmask --- .../updates/pending_db_world/rev_1713699453958519800.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713699453958519800.sql diff --git a/data/sql/updates/pending_db_world/rev_1713699453958519800.sql b/data/sql/updates/pending_db_world/rev_1713699453958519800.sql new file mode 100644 index 000000000..1eaebeb02 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713699453958519800.sql @@ -0,0 +1,7 @@ +-- Update gameobject 'A Dusty Tome' with sniffed values + +-- new spawns +DELETE FROM `gameobject` WHERE (`id` IN (179548)) +AND (`guid` IN (20)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(20, 179548, 429, 0, 0, 1, 1, 4.497807025909423828, -437.5672607421875, 16.41251754760742187, 4.136432647705078125, 0, 0, -0.87881660461425781, 0.477159708738327026, 7200, 255, 1, "", 52237, NULL); From 43792db685e824811b3b41c2d0f107d58255d409 Mon Sep 17 00:00:00 2001 From: Balleny <12682004+balleny@users.noreply.github.com> Date: Sun, 21 Apr 2024 21:57:24 +0200 Subject: [PATCH 13/20] fix(Scripts/TheEye): Update Kaelthas Phoenix timers (#18657) Update Kaelthas Phoenix timers --- .../scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 04cb7a1d4..116085a64 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -472,11 +472,11 @@ struct boss_kaelthas : public BossAI { DoCastRandomTarget(SPELL_FLAME_STRIKE, 0, 100.0f); }, 30250ms, 50650ms); - ScheduleTimedEvent(20000ms, [&] + ScheduleTimedEvent(71000ms, [&] { Talk(SAY_SUMMON_PHOENIX); DoCastSelf(SPELL_PHOENIX); - }, 31450ms, 66550ms); + }, 61450ms, 96550ms); ScheduleTimedEvent(5s, [&] { scheduler.DelayAll(30s); @@ -735,11 +735,11 @@ struct boss_kaelthas : public BossAI { DoCastRandomTarget(SPELL_FLAME_STRIKE, 0, 100.0f); }, 30250ms, 50650ms); - ScheduleTimedEvent(30000ms, [&] + ScheduleTimedEvent(50000ms, [&] { Talk(SAY_SUMMON_PHOENIX); DoCastSelf(SPELL_PHOENIX); - }, 31450ms, 66550ms); + }, 35450ms, 41550ms); //sequence ScheduleTimedEvent(20s, 23s, [&] { From b18e00cca60c0eb1ab7d3cdaf76fe9bfcbdb6053 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 21 Apr 2024 22:27:10 +0200 Subject: [PATCH 14/20] fix(DB/Gameobject): add missing script to some fire places (#18768) --- .../updates/pending_db_world/rev_1713610036097360400.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713610036097360400.sql diff --git a/data/sql/updates/pending_db_world/rev_1713610036097360400.sql b/data/sql/updates/pending_db_world/rev_1713610036097360400.sql new file mode 100644 index 000000000..bb70ebcf7 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713610036097360400.sql @@ -0,0 +1,6 @@ +-- add missing script to some fire places +-- Campfire +UPDATE `gameobject_template` SET `ScriptName` = 'go_flames' WHERE (`entry` = 177324); + +-- Burning Embers +UPDATE `gameobject_template` SET `ScriptName` = 'go_flames' WHERE (`entry` BETWEEN 3832 AND 3838); From 1ee40a718eb5e0c4a9bcde9463946924d2d84f24 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Apr 2024 20:30:10 +0000 Subject: [PATCH 15/20] chore(DB): import pending files Referenced commit(s): 3176615a1d78bcca1e55b8594c0d9a7e3dea00d5 --- .../rev_1713467863396026800.sql => db_world/2024_04_21_00.sql} | 1 + .../rev_1713610036097360400.sql => db_world/2024_04_21_01.sql} | 1 + .../rev_1713615045654319800.sql => db_world/2024_04_21_02.sql} | 1 + .../rev_1713699453958519800.sql => db_world/2024_04_21_03.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/rev_1713467863396026800.sql => db_world/2024_04_21_00.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1713610036097360400.sql => db_world/2024_04_21_01.sql} (85%) rename data/sql/updates/{pending_db_world/rev_1713615045654319800.sql => db_world/2024_04_21_02.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1713699453958519800.sql => db_world/2024_04_21_03.sql} (93%) diff --git a/data/sql/updates/pending_db_world/rev_1713467863396026800.sql b/data/sql/updates/db_world/2024_04_21_00.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1713467863396026800.sql rename to data/sql/updates/db_world/2024_04_21_00.sql index d4ab51a4d..df8dde649 100644 --- a/data/sql/updates/pending_db_world/rev_1713467863396026800.sql +++ b/data/sql/updates/db_world/2024_04_21_00.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_20_01 -> 2024_04_21_00 -- Update gameobject '%Cauldron%' with sniffed values -- updated spawns DELETE FROM `gameobject` WHERE (`id` IN (157969, 2719, 142690, 59850, 142693, 20877, 18342, 18345, 18341, 18340, 36396, 148511, 153220, 18084, 20878, 176574, 176559, 31580, 160421, 3266, 103772, 18083, 141845, 149029, 18079, 142118, 181445, 182575, 183827, 183895, 183922, 183923, 183924, 183925, 183926, 183927, 183930, 183931, 184003, 184355, 184370, 184373, 184472, 184475, 184715, 185180, 185283, 185289, 141851, 181322, 181315, 3315, 179704, 92099, 20870, 20871, 103663, 89931, 20872, 187879, 59530, 59529, 74078, 74075, 74076, 176899, 178524, 178572, 178573, 160470, 177284, 177285, 177286, 176393, 177289, 176392, 176361, 20970, 176273, 176275, 20869, 177244, 176091, 32879, 32880, 153124, 153125, 176278, 176284, 153576, 153577, 153579, 175984, 186656, 190021, 188495, 188246, 188248, 190618, 190619, 190620, 190630, 187690, 192916, 190936, 190937, 187714, 2076, 186451, 181327)) diff --git a/data/sql/updates/pending_db_world/rev_1713610036097360400.sql b/data/sql/updates/db_world/2024_04_21_01.sql similarity index 85% rename from data/sql/updates/pending_db_world/rev_1713610036097360400.sql rename to data/sql/updates/db_world/2024_04_21_01.sql index bb70ebcf7..f79c0a09d 100644 --- a/data/sql/updates/pending_db_world/rev_1713610036097360400.sql +++ b/data/sql/updates/db_world/2024_04_21_01.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_21_00 -> 2024_04_21_01 -- add missing script to some fire places -- Campfire UPDATE `gameobject_template` SET `ScriptName` = 'go_flames' WHERE (`entry` = 177324); diff --git a/data/sql/updates/pending_db_world/rev_1713615045654319800.sql b/data/sql/updates/db_world/2024_04_21_02.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1713615045654319800.sql rename to data/sql/updates/db_world/2024_04_21_02.sql index 7ef10cce6..5aec21a3f 100644 --- a/data/sql/updates/pending_db_world/rev_1713615045654319800.sql +++ b/data/sql/updates/db_world/2024_04_21_02.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_21_01 -> 2024_04_21_02 -- make 'Midsummer Celebrants' talk regularly DELETE FROM `smart_scripts` WHERE (`entryorguid` = 16781) AND (`source_type` = 0) AND (`id` IN (2)); 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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1713699453958519800.sql b/data/sql/updates/db_world/2024_04_21_03.sql similarity index 93% rename from data/sql/updates/pending_db_world/rev_1713699453958519800.sql rename to data/sql/updates/db_world/2024_04_21_03.sql index 1eaebeb02..386ba739e 100644 --- a/data/sql/updates/pending_db_world/rev_1713699453958519800.sql +++ b/data/sql/updates/db_world/2024_04_21_03.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_21_02 -> 2024_04_21_03 -- Update gameobject 'A Dusty Tome' with sniffed values -- new spawns From dbe04a8a140e3e423eaedba5754cc08f3abd9354 Mon Sep 17 00:00:00 2001 From: daobashun <49193927+fangshun2004@users.noreply.github.com> Date: Mon, 22 Apr 2024 05:00:59 +0800 Subject: [PATCH 16/20] fix(DB/Spell) Fix the Spell Upgrade Zigguraut visuals (#18771) * Fix the visuals * fix * fix error * edit * add DELETE * fix error --- .../rev_1713631238575683400.sql | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713631238575683400.sql diff --git a/data/sql/updates/pending_db_world/rev_1713631238575683400.sql b/data/sql/updates/pending_db_world/rev_1713631238575683400.sql new file mode 100644 index 000000000..0a6a24a47 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713631238575683400.sql @@ -0,0 +1,54 @@ +DELETE FROM `spell_target_position` WHERE `ID`=17278 AND `EffectIndex`=0; +DELETE FROM `spell_target_position` WHERE `ID`=17237 AND `EffectIndex`=0; +DELETE FROM `spell_target_position` WHERE `ID`=17239 AND `EffectIndex`=0; +DELETE FROM `spell_target_position` WHERE `ID`=17240 AND `EffectIndex`=0; +INSERT INTO `spell_target_position` VALUES +(17278, 0, 329, 3533.95, -2965.1, 125, 0, 0), +(17237, 0, 329, 3838, -3500, 195, 0, 0), +(17239, 0, 329, 3847, -3748, 195, 0, 0), +(17240, 0, 329, 4057, -3665, 182, 0, 0); + +DELETE FROM `creature_text` WHERE `CreatureID` = 10399; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(10399, 0, 0, 'One of the Ash\'ari Crystals has been destroyed! Slay the intruders!', 14, 0, 100, 0, 0, 0, 6492, 3, 'Thuzadin Acolyte'), +(10399, 0, 1, 'An Ash\'ari Crystal has fallen! Stay true to the Lich King, my brethren, and attempt to resummon it.', 14, 0, 100, 0, 0, 0, 6526, 3, 'Thuzadin Acolyte'), +(10399, 0, 2, 'An Ash\'ari Crystal has been toppled! Restore the ziggurat before the Slaughterhouse is vulnerable!', 14, 0, 100, 0, 0, 0, 6527, 3, 'Thuzadin Acolyte'); + +-- Thuzadin Acolyte smart ai +SET @ENTRY := 10399; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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 +-- Cannot be used with Spell 17237 +(@ENTRY, 0, 0, 0, 1, 0, 100, 1, 0, 0, 5200, 5200, 11, 17224, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Thuzadin Acolyte - Out of Combat - Cast spell (17224) on Self'), +(@ENTRY, 0, 1, 0, 0, 0, 100, 0, 0, 2000, 3000, 4500, 11, 11660, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Thuzadin Acolyte - In Combat - Cast spell (11660) with flags combat move on Victim'), +(@ENTRY, 0, 2, 3, 6, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 10, 53267, 10399, 0, 0, 0, 0, 0, 'On death - Creature Thuzadin Acolyte (10399) with guid 53267 (fetching): Talk 0 to invoker'), +(@ENTRY, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 10415, 200, 0, 0, 0, 0, 0, 'On death - Closest alive creature Ash\'ari Crystal (10415) in 200 yards: Set creature data #2 to 2'), +-- Cannot be used with Spell 17224 +(@ENTRY, 0, 4, 0, 1, 0, 100, 0, 5000, 5000, 5000, 5000, 11, 17237, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Thuzadin Acolyte - Out of Combat Cast spell (17237) on Self'), +(@ENTRY, 0, 5, 0, 1, 0, 100, 0, 5000, 5000, 5000, 5000, 11, 17239, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Thuzadin Acolyte - Out of Combat Cast spell (17239) on Self'), +(@ENTRY, 0, 6, 0, 1, 0, 100, 0, 5000, 5000, 5000, 5000, 11, 17240, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Thuzadin Acolyte - Out of Combat Cast spell (17240) on Self'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 10399 AND `SourceId` = 0; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `Comment`) VALUES +(22, 1, 10399, 0, 0, 31, 1, 3, 10399, 53262, 0, 'Object is creature, entry is 10399 and guid is 53262'), +(22, 1, 10399, 0, 1, 31, 1, 3, 10399, 53263, 0, 'Object is creature, entry is 10399 and guid is 53263'), +(22, 1, 10399, 0, 2, 31, 1, 3, 10399, 53264, 0, 'Object is creature, entry is 10399 and guid is 53264'), +(22, 1, 10399, 0, 3, 31, 1, 3, 10399, 53265, 0, 'Object is creature, entry is 10399 and guid is 53265'), +(22, 1, 10399, 0, 4, 31, 1, 3, 10399, 53266, 0, 'Object is creature, entry is 10399 and guid is 53266'), +(22, 3, 10399, 0, 0, 29, 1, 10399, 50, 0, 1, 'There is no creature Thuzadin Acolyte (10399) within range 50 yards to Object'), +(22, 5, 10399, 0, 0, 31, 1, 3, 10399, 53262, 0, 'Object is creature, entry is 10399 and guid is 53262'), +(22, 5, 10399, 0, 1, 31, 1, 3, 10399, 53263, 0, 'Object is creature, entry is 10399 and guid is 53263'), +(22, 5, 10399, 0, 2, 31, 1, 3, 10399, 53264, 0, 'Object is creature, entry is 10399 and guid is 53264'), +(22, 5, 10399, 0, 3, 31, 1, 3, 10399, 53265, 0, 'Object is creature, entry is 10399 and guid is 53265'), +(22, 5, 10399, 0, 4, 31, 1, 3, 10399, 53266, 0, 'Object is creature, entry is 10399 and guid is 53266'), +(22, 6, 10399, 0, 0, 31, 1, 3, 10399, 53268, 0, 'Object is creature, entry is 10399 and guid is 53268'), +(22, 6, 10399, 0, 1, 31, 1, 3, 10399, 53269, 0, 'Object is creature, entry is 10399 and guid is 53269'), +(22, 6, 10399, 0, 2, 31, 1, 3, 10399, 53270, 0, 'Object is creature, entry is 10399 and guid is 53270'), +(22, 6, 10399, 0, 3, 31, 1, 3, 10399, 53271, 0, 'Object is creature, entry is 10399 and guid is 53271'), +(22, 6, 10399, 0, 4, 31, 1, 3, 10399, 53272, 0, 'Object is creature, entry is 10399 and guid is 53272'), +(22, 7, 10399, 0, 0, 31, 1, 3, 10399, 53258, 0, 'Object is creature, entry is 10399 and guid is 53258'), +(22, 7, 10399, 0, 1, 31, 1, 3, 10399, 53259, 0, 'Object is creature, entry is 10399 and guid is 53259'), +(22, 7, 10399, 0, 2, 31, 1, 3, 10399, 53260, 0, 'Object is creature, entry is 10399 and guid is 53260'), +(22, 7, 10399, 0, 3, 31, 1, 3, 10399, 53261, 0, 'Object is creature, entry is 10399 and guid is 53261'), +(22, 7, 10399, 0, 4, 31, 1, 3, 10399, 53257, 0, 'Object is creature, entry is 10399 and guid is 53257'); From 0572848a07423e048c9b7f475f43e4863c28d7e0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Apr 2024 21:01:53 +0000 Subject: [PATCH 17/20] chore(DB): import pending files Referenced commit(s): dbe04a8a140e3e423eaedba5754cc08f3abd9354 --- .../rev_1713631238575683400.sql => db_world/2024_04_21_04.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1713631238575683400.sql => db_world/2024_04_21_04.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1713631238575683400.sql b/data/sql/updates/db_world/2024_04_21_04.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1713631238575683400.sql rename to data/sql/updates/db_world/2024_04_21_04.sql index 0a6a24a47..6e1ba7bc5 100644 --- a/data/sql/updates/pending_db_world/rev_1713631238575683400.sql +++ b/data/sql/updates/db_world/2024_04_21_04.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_21_03 -> 2024_04_21_04 DELETE FROM `spell_target_position` WHERE `ID`=17278 AND `EffectIndex`=0; DELETE FROM `spell_target_position` WHERE `ID`=17237 AND `EffectIndex`=0; DELETE FROM `spell_target_position` WHERE `ID`=17239 AND `EffectIndex`=0; From cb4a3390f9d22d3db4fc2f4301ad016d81d8f9be Mon Sep 17 00:00:00 2001 From: daobashun <49193927+fangshun2004@users.noreply.github.com> Date: Mon, 22 Apr 2024 05:02:03 +0800 Subject: [PATCH 18/20] fix(DB/Creature)Added paths for patrolling mobs in the Scarlet Abbey chapel area (#18734) * Patrol mobs in the Cathedral Added patrols * Modify the annotation * Add line breaks * edit * delect conditions * add point * delete waypoint_data path (400080 400310) --- .../rev_1713004478213792900.sql | 265 ++++++++++++++++++ 1 file changed, 265 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713004478213792900.sql diff --git a/data/sql/updates/pending_db_world/rev_1713004478213792900.sql b/data/sql/updates/pending_db_world/rev_1713004478213792900.sql new file mode 100644 index 000000000..92d3fee34 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713004478213792900.sql @@ -0,0 +1,265 @@ +-- Scarlet Centurion with guid 39959 smart ai +SET @ENTRY := -39959; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4301; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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, 1, 0, 100, 0, 0, 0, 0, 0, 53, 0, 3995900, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Once (OOC) - Self: Start path #3995900, walk, repeat, Aggressive'); + +SET @PATH := 3995900; +DELETE FROM `waypoints` WHERE `entry`= @PATH; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES +(@PATH, 1, 921.6099, 1377.474, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 2, 910.2684, 1384.033, 18.14382, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 3, 908.9036, 1414.986, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 4, 922.2239, 1422.836, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 5, 940.1893, 1423.288, 18.19546, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 6, 953.9409, 1423.293, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 7, 962.9168, 1421.757, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 8, 964.4153, 1434.409, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 9, 962.9168, 1421.757, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 10, 953.9409, 1423.293, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 11, 940.1893, 1423.288, 18.19546, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 12, 922.2239, 1422.836, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 13, 908.9036, 1414.986, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 14, 910.2684, 1384.033, 18.14382, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 15, 921.6099, 1377.474, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 16, 942.4823, 1377.869, 18.22111, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 17, 959.5735, 1377.871, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 18, 963.7056, 1368.213, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 19, 963.7056, 1368.213, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 20, 959.5735, 1377.871, 18.04585, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'), +(@PATH, 21, 942.4823, 1377.869, 18.22111, NULL, 0, 'Scarlet Monastery Guid 39959 Patrol'); + +-- Scarlet Sorcerer with guid 39998 smart ai +SET @ENTRY := -39998; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4294; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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, 1, 0, 100, 0, 0, 0, 0, 0, 53, 0, 3999800, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Once (OOC) - Self: Start path #3999800, walk, repeat, Aggressive'); + +SET @PATH := 3999800; +DELETE FROM `waypoints` WHERE `entry`= @PATH; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES +(@PATH, 1, 1048.8198 ,1454.7341 ,29.24898, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 2, 1045.2096 ,1448.4248 ,29.248976, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 3, 1044.7418 ,1438.5563 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 4, 1031.598 ,1433.3317 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 5, 1011.3624 ,1437.2462 , 27.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 6, 989.74774 ,1436.1188 , 27.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 7, 986.0866 ,1418.0801 , 24.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 8, 964.4335 ,1418.325 , 18.84273, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 9, 986.0866 ,1418.0801 ,24.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 10, 989.74774 ,1436.1188 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 11, 1011.3624 ,1437.2462 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 12, 1031.598 ,1433.3317 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 13, 1044.7418 ,1438.5563 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'), +(@PATH, 14, 1045.2096 ,1448.4248 ,29.248976, NULL, 0, 'Scarlet Monastery Guid 39998 Patrol'); + +-- Scarlet Myrmidon with guid 39967 smart ai +SET @ENTRY := -39967; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4300; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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, 1, 0, 100, 0, 0, 0, 0, 0, 53, 0, 3996700, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Once (OOC) - Self: Start path #3996700, walk, repeat, Aggressive'); + +DELETE FROM `creature` WHERE (`id1` = 4300) AND (`guid` IN (39967)); +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(39967, 4300, 0, 0, 189, 0, 0, 1, 1, 1, 943.8057, 1360.7302, 18.795536, 3.1434457302093506, 86400, 2, 0, 3514, 5950, 1, 0, 0, 0, '', 0); + +SET @PATH := 3996700; +DELETE FROM `waypoints` WHERE `entry`= @PATH; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES +(@PATH, 1, 893.3013, 1360.65, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 2, 889.6783, 1367.656, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 3, 889.9191, 1398.58, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 4, 889.9798, 1430.839, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 5, 896.0825, 1437.567, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 6, 916.9831, 1437.534, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 7, 948.0972, 1437.544, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 8, 916.9831, 1437.534, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 9, 896.0825, 1437.567, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 10, 889.9798, 1430.839, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 11, 889.9191, 1398.58, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 12, 889.6783, 1367.656, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 13, 893.3013, 1360.65, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 14, 916.6596, 1360.68, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 15, 948.0366, 1360.763, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'), +(@PATH, 16, 916.6596, 1360.68, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39967 Patrol'); + +-- Scarlet Centurion with guid 39978 smart ai +SET @ENTRY := -39978; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4301; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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, 60, 0, 100, 0, 0, 0, 0, 0, 53, 0, 3997800, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Once - Self: Start path #3997800, walk, repeat, Aggressive'); + +SET @PATH := 3997800; +DELETE FROM `waypoints` WHERE `entry`= @PATH; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES +(@PATH, 1, 992.4866 ,1343.4125 ,29.248978, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 2, 1004.212 ,1343.4463 ,29.24898, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 3, 1027.6887 ,1343.4991 ,29.248978, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 4, 1045.2471 ,1345.6957 ,29.24898, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 5, 1045.5465 ,1356.4733 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 6, 1037.7705 ,1367.9752 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 7, 1040.2479 ,1383.3046 ,27.436476, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 8, 1045.2888 ,1401.2083 ,27.43648, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 9, 1038.3645 ,1413.4927 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 10, 1039.7012 ,1423.1774 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 11, 1046.1355 ,1442.3398 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 12, 1045.7563 ,1454.8784 ,29.24898, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 13, 1033.3754 ,1454.7417 ,29.382483, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 14, 1004.4383 ,1454.7516 ,29.248978, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 15, 983.2637 ,1454.7847 ,29.248978, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 16, 1004.4383 ,1454.7516 ,29.248978, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 17, 1033.3754 ,1454.7417 ,29.382483, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 18, 1045.7563 ,1454.8784 ,29.24898, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 19, 1046.1355 ,1442.3398 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 20, 1039.7401 ,1423.2935 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 21, 1038.3645 ,1413.4927 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 22, 1045.2888 ,1401.2083 ,27.43648, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 23, 1040.2479 ,1383.3046 ,27.436476, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 24, 1037.7705 ,1367.9752 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 25, 1045.5465 ,1356.4733 ,27.436478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 26, 1045.2471 ,1345.6957 ,29.24898, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 27, 1040.5303 ,1345.1056 ,29.24898, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +-- (@PATH, 28, 1036.6069 ,1344.6147 , 29.248978, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +-- (@PATH, 29, 1036.2529 ,1344.5706 , 29.41444, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +-- (@PATH, 30, 1035.7527 ,1344.5079 , 29.24478, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +-- (@PATH, 31, 1031.2517 ,1343.9448 , 29.248978, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +-- (@PATH, 32, 1030.8684 ,1343.897 , 29.451473, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +-- (@PATH, 33, 1030.5647 ,1343.8589 , 29.247059, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 28, 1027.6887 ,1343.4991 , 29.248978, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'), +(@PATH, 29, 1004.212 ,1343.4463 , 29.24898, NULL, 0, 'Scarlet Monastery Guid 39978 Patrol'); + +-- Scarlet Myrmidon with guid 39980 smart ai +SET @ENTRY := -39980; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4295; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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, 1, 0, 100, 0, 0, 0, 0, 0, 53, 0, 3998000, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Once (OOC) - Self: Start path #3998000, walk, repeat, Aggressive'); + +SET @PATH := 3998000; +DELETE FROM `waypoints` WHERE `entry`= @PATH; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES +(@PATH, 1, 1000.262, 1360.218, 27.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 2, 986.8563, 1362.948, 27.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 3, 985.2372, 1379.213, 24.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 4, 963.3975, 1379.723, 18.84273, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 5, 985.2372, 1379.213, 24.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 6, 986.8563, 1362.948, 27.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 7, 1000.262, 1360.218, 27.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 8, 1026.781, 1361.222, 27.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 9, 1041.813, 1368.812, 27.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 10, 1049.958, 1360.567, 27.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 11, 1041.813, 1368.812, 27.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'), +(@PATH, 12, 1026.781, 1361.222, 27.43648, NULL, 0, 'Scarlet Monastery Guid 39980 Patrol'); + +UPDATE `creature` SET `id1`=4295, `id2`=0, `id3`=0, `map`=189, `zoneId`=0, `areaId`=0, `spawnMask`=1, `phaseMask`=1, `equipment_id`=1, `position_x`=1027.78, `position_y`=1399.18, `position_z`=27.3967, `orientation`=3.15905, `spawntimesecs`=86400, `wander_distance`=0, `currentwaypoint`=0, `curhealth`=3831, `curmana`=0, `MovementType`=0, `npcflag`=0, `unit_flags`=0, `dynamicflags`=0, `ScriptName`='', `VerifiedBuild`=0, `CreateObject`=0, `Comment`=NULL WHERE `guid`=39982; + +-- Scarlet Wizard with guid 40015 smart ai +SET @ENTRY := -40015; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4300; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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, 1, 0, 100, 0, 0, 0, 0, 0, 53, 0, 4001500, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Once (OOC) - Self: Start path #4001500, walk, repeat, Aggressive'); + +SET @PATH := 4001500; +DELETE FROM `waypoints` WHERE `entry`= @PATH; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES +(@PATH, 1, 1109.386, 1417.222, 30.44585, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'), +(@PATH, 2, 1126.689, 1417.373, 30.64322, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'), +(@PATH, 3, 1138.397, 1423.53, 30.49723, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'), +(@PATH, 4, 1141.203, 1453.949, 30.44585, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'), +(@PATH, 5, 1138.397, 1423.53, 30.49723, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'), +(@PATH, 6, 1126.724, 1417.391, 30.70664, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'), +(@PATH, 7, 1109.402, 1417.222, 30.44585, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'), +(@PATH, 8, 1082.383, 1418.53, 30.44585, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'), +(@PATH, 9, 1082.713, 1410.991, 30.55198, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'), +(@PATH, 10, 1082.383, 1418.53, 30.44585, NULL, 0,'Scarlet Monastery Guid 40015 Patrol'); + +-- Scarlet Wizard with guid 40019 smart ai +SET @ENTRY := -40019; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4300; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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, 1, 0, 100, 0, 0, 0, 0, 0, 53, 0, 4001900, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Once (OOC) - Self: Start path #4001900, walk, repeat, Aggressive'); + +SET @PATH := 4001900; +DELETE FROM `waypoints` WHERE `entry`= @PATH; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES +(@PATH, 1, 1117.623, 1380.505, 30.44585, NULL, 0,'Scarlet Monastery Guid 40019 Patrol'), +(@PATH, 2, 1136.148, 1379.347, 30.50507, NULL, 0,'Scarlet Monastery Guid 40019 Patrol'), +(@PATH, 3, 1137.257, 1363.06, 30.44585, NULL, 0,'Scarlet Monastery Guid 40019 Patrol'), +(@PATH, 4, 1140.875, 1349.175, 30.44586, NULL, 0,'Scarlet Monastery Guid 40019 Patrol'), +(@PATH, 5, 1137.257, 1363.06, 30.44585, NULL, 0,'Scarlet Monastery Guid 40019 Patrol'), +(@PATH, 6, 1136.148, 1379.347, 30.50507, NULL, 0,'Scarlet Monastery Guid 40019 Patrol'), +(@PATH, 7, 1117.623, 1380.505, 30.44585, NULL, 0,'Scarlet Monastery Guid 40019 Patrol'), +(@PATH, 8, 1091.545, 1380.518, 30.66889, NULL, 0,'Scarlet Monastery Guid 40019 Patrol'); + +-- Scarlet Chaplain with guid 40008 smart ai +SET @ENTRY := -40008; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4299; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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, 1, 0, 100, 0, 0, 0, 0, 0, 53, 0, 4000800, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Once (OOC) - Self: Start path #4000800, walk, repeat, Aggressive'); + +DELETE FROM `creature` WHERE (`id1` = 4299) AND (`guid` IN (40008)); +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(40008, 4299, 0, 0, 189, 0, 0, 1, 1, 1, 1081.6327, 1379.4738, 30.445854, 3.1230602264404297, 86400, 0, 1, 2901, 2014, 2, 0, 0, 0, '', 0); + +DELETE FROM `creature_addon` WHERE (`guid` IN (40008)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(40008, 0, 0, 0, 0, 0, 0, NULL); + +SET @PATH := 4000800; +DELETE FROM `waypoints` WHERE `entry`= @PATH; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES +(@PATH, 1, 1081.633, 1379.474, 30.44585, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 2, 1081.354, 1385.916, 30.44585, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 3, 1081.633, 1379.474, 30.44585, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 4, 1100.825, 1379.118, 30.44586, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 5, 1128.136, 1379.364, 30.47259, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 6, 1137.428, 1373.87, 30.43785, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 7, 1140.826, 1345.011, 30.44586, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 8, 1137.428, 1373.87, 30.43785, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 9, 1128.276, 1379.281, 30.44585, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 10, 1100.825, 1379.118, 30.44586, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'), +(@PATH, 11, 1081.633, 1379.474, 30.44585, NULL, 0,'Scarlet Monastery Guid 40008 Patrol'); + +UPDATE `creature` SET `MovementType`=0 WHERE `guid`=40008; + +-- delete waypoint_data path +DELETE FROM `waypoint_data` WHERE `id`=400080; + +-- Scarlet Wizard with guid 40034 smart ai +SET @ENTRY := -40034; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4300; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +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, 1, 0, 100, 0, 0, 0, 0, 0, 53, 0, 4003400, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Once (OOC) - Self: Start path #4003400, walk, repeat, Aggressive'); + +SET @PATH := 4003400; +DELETE FROM `waypoints` WHERE `entry`= @PATH; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES +(@PATH, 1, 1140.994, 1449.657, 30.44585, NULL, 0,'Scarlet Monastery Guid 40034 Patrol'), +(@PATH, 2, 1137.558, 1435.392, 30.44586, NULL, 0,'Scarlet Monastery Guid 40034 Patrol'), +(@PATH, 3, 1135.353, 1419.83, 30.53343, NULL, 0,'Scarlet Monastery Guid 40034 Patrol'), +(@PATH, 4, 1112.505, 1417.833, 30.44585, NULL, 0,'Scarlet Monastery Guid 40034 Patrol'), +(@PATH, 5, 1091.572, 1417.443, 30.44585, NULL, 0,'Scarlet Monastery Guid 40034 Patrol'), +(@PATH, 6, 1112.505, 1417.833, 30.44585, NULL, 0,'Scarlet Monastery Guid 40034 Patrol'), +(@PATH, 7, 1135.353, 1419.83, 30.53343, NULL, 0,'Scarlet Monastery Guid 40034 Patrol'), +(@PATH, 8, 1137.558, 1435.392, 30.44586, NULL, 0,'Scarlet Monastery Guid 40034 Patrol'), +(@PATH, 9, 1140.994, 1449.657, 30.44585, NULL, 0,'Scarlet Monastery Guid 40034 Patrol'); + +-- Replaces the generated coordinates +DELETE FROM `creature` WHERE (`id1` = 4302) AND (`guid` IN (40031)); +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(40031, 4302, 0, 0, 189, 0, 0, 1, 1, 1, 1138.5015, 1369.3634, 30.3899, 1.4660766124725342, 86400, 2, 1, 3540, 2472, 1, 0, 0, 0, '', 0); + +DELETE FROM `creature_addon` WHERE (`guid` IN (40031)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(40031, 0, 0, 0, 1, 0, 0, NULL); + +-- delete waypoint_data path +DELETE FROM `waypoint_data` WHERE `id`=400310; From 51ec92535190f3179205539c8cbb4c012fc646c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Apr 2024 21:02:43 +0000 Subject: [PATCH 19/20] chore(DB): import pending files Referenced commit(s): 0572848a07423e048c9b7f475f43e4863c28d7e0 --- .../rev_1713004478213792900.sql => db_world/2024_04_21_05.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1713004478213792900.sql => db_world/2024_04_21_05.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1713004478213792900.sql b/data/sql/updates/db_world/2024_04_21_05.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1713004478213792900.sql rename to data/sql/updates/db_world/2024_04_21_05.sql index 92d3fee34..9ae75f621 100644 --- a/data/sql/updates/pending_db_world/rev_1713004478213792900.sql +++ b/data/sql/updates/db_world/2024_04_21_05.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_21_04 -> 2024_04_21_05 -- Scarlet Centurion with guid 39959 smart ai SET @ENTRY := -39959; UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4301; From f380e8f625a3e88cb40377faffff2211a0fcdc5b Mon Sep 17 00:00:00 2001 From: Balleny <12682004+balleny@users.noreply.github.com> Date: Mon, 22 Apr 2024 13:22:38 +0200 Subject: [PATCH 20/20] fix(Scripts/TheEye): Update Astromancer timings and add phase (#18655) * Update Astromancer timings * Reworked order and timings * Whitespace removal * Remove more whitespace * Update boss_astromancer.cpp * cleanup .schedule --- .../TempestKeep/Eye/boss_astromancer.cpp | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 4e9b4e9c2..3ca2ffeb8 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -38,6 +38,7 @@ enum Spells SPELL_PSYCHIC_SCREAM = 34322, SPELL_VOID_BOLT = 39329, SPELL_TRUE_BEAM = 33365, + SPELL_TELEPORT_START_POSITION = 33244, }; enum Misc @@ -55,6 +56,9 @@ enum Misc #define CENTER_Z 17.9608f #define CENTER_O 1.06421f #define PORTAL_Z 17.005f +#define START_POSITION_X 432.74f +#define START_POSITION_Y -373.645f +#define START_POSITION_Z 18.0138f struct boss_high_astromancer_solarian : public BossAI { @@ -146,11 +150,30 @@ struct boss_high_astromancer_solarian : public BossAI }).Schedule(52100ms, [this](TaskContext context) { me->SetReactState(REACT_PASSIVE); - Talk(SAY_SUMMON); - me->RemoveAllAuras(); - me->SetModelVisible(false); - scheduler.DelayAll(21s); - scheduler.Schedule(6s, [this](TaskContext) + scheduler.DelayAll(22s); + // blink to room center in this line using SPELL_TELEPORT_START_POSITION and START_POSITION_X, START_POSITION_Y, START_POSITION_Z + scheduler.Schedule(1s, [this](TaskContext) + { + for (uint8 i = 0; i < 3; ++i) + { + float o = rand_norm() * 2 * M_PI; + if (i == 0) + { + me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, CENTER_X + cos(o)*INNER_PORTAL_RADIUS, CENTER_Y + std::sin(o)*INNER_PORTAL_RADIUS, CENTER_Z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000); + } + else + { + me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, CENTER_X + cos(o)*OUTER_PORTAL_RADIUS, CENTER_Y + std::sin(o)*OUTER_PORTAL_RADIUS, PORTAL_Z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000); + } + } + }).Schedule(2s, [this](TaskContext) + { + Talk(SAY_SUMMON); + }).Schedule(3s, [this](TaskContext) + { + me->RemoveAllAuras(); + me->SetModelVisible(false); + }).Schedule(7s, [this](TaskContext) { summons.DoForAllSummons([&](WorldObject* summon) { @@ -171,7 +194,7 @@ struct boss_high_astromancer_solarian : public BossAI } } }); - }).Schedule(20s, [this](TaskContext) + }).Schedule(23s, [this](TaskContext) { me->SetReactState(REACT_AGGRESSIVE); summons.DoForAllSummons([&](WorldObject* summon) @@ -194,20 +217,7 @@ struct boss_high_astromancer_solarian : public BossAI } }); }); - - for (uint8 i = 0; i < 3; ++i) - { - float o = rand_norm() * 2 * M_PI; - if (i == 0) - { - me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, CENTER_X + cos(o)*INNER_PORTAL_RADIUS, CENTER_Y + std::sin(o)*INNER_PORTAL_RADIUS, CENTER_Z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 26000); - } - else - { - me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, CENTER_X + cos(o)*OUTER_PORTAL_RADIUS, CENTER_Y + std::sin(o)*OUTER_PORTAL_RADIUS, PORTAL_Z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 26000); - } - } - context.Repeat(67500ms, 71200ms); + context.Repeat(87500ms, 91200ms); }); } @@ -280,4 +290,3 @@ void AddSC_boss_high_astromancer_solarian() RegisterSpellScript(spell_astromancer_wrath_of_the_astromancer); RegisterSpellScript(spell_astromancer_solarian_transform); } -