From 8195708962fbb808314b9066ce7f5027b88cca1e Mon Sep 17 00:00:00 2001
From: Stifler82 <xspidey@hotmail.it>
Date: Sun, 28 Feb 2021 13:27:07 +0000
Subject: [PATCH] fix(DB/Core/Creatures/SAI): Pyrewood Ambush Quest (#4649)

---
 .../rev_1614294683092657800.sql               | 71 +++++++++++++++++++
 .../zone_silverpine_forest.cpp                |  9 +--
 2 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1614294683092657800.sql

diff --git a/data/sql/updates/pending_db_world/rev_1614294683092657800.sql b/data/sql/updates/pending_db_world/rev_1614294683092657800.sql
new file mode 100644
index 000000000..215cda406
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1614294683092657800.sql
@@ -0,0 +1,71 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1614294683092657800');
+
+UPDATE `creature_template` SET `faction` = 123, `AIName` = 'SmartAI' WHERE `entry` IN (2060,2061,2062,2063,2064,2065,2066,2067,2068);
+
+UPDATE `creature_template` SET `faction` = 123 WHERE `entry` =1893;
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0) AND (`entryorguid` IN (2060,2061,2062,2063,2064,2065,2066,2067,2068));
+INSERT INTO `smart_scripts` VALUES
+(2060, 0, 0, 1, 2, 0, 25, 1, 70, 80, 0, 0, 0, 36, 1893, 15, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Smithers - Between 70-80% Health - Update Template To \'Moonrage Sentry\' (No Repeat)'),
+(2060, 0, 1, 2, 61, 0, 100, 0, 70, 80, 0, 0, 0, 11, 24085, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Smithers - Between 70-80% Health - Cast \'Transform Visual\' (No Repeat)'),
+(2060, 0, 2, 0, 61, 0, 100, 0, 70, 80, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Smithers - Between 70-80% Health - Set Event Phase 1 (No Repeat)'),
+(2060, 0, 3, 0, 0, 1, 100, 0, 100, 100, 60000, 60000, 0, 11, 6507, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Smithers - In Combat - Cast \'Battle Roar\' (Phase 1)'),
+(2060, 0, 4, 0, 0, 1, 100, 0, 800, 800, 60000, 60000, 0, 11, 13730, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Smithers - In Combat - Cast \'Demoralizing Shout\' (Phase 1)'),
+(2060, 0, 5, 0, 7, 1, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Smithers - On Evade - Despawn In 1500 ms (Phase 1)'),
+(2060, 0, 6, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Smithers - On Evade - Despawn In 1500 ms'),
+(2061, 0, 0, 1, 2, 0, 25, 1, 70, 80, 0, 0, 0, 36, 1893, 15, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Thatcher - Between 70-80% Health - Update Template To \'Moonrage Sentry\' (No Repeat)'),
+(2061, 0, 1, 2, 61, 0, 100, 0, 70, 80, 0, 0, 0, 11, 24085, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Thatcher - Between 70-80% Health - Cast \'Transform Visual\' (No Repeat)'),
+(2061, 0, 2, 0, 61, 0, 100, 0, 70, 80, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Thatcher - Between 70-80% Health - Set Event Phase 1 (No Repeat)'),
+(2061, 0, 3, 0, 0, 1, 100, 0, 100, 100, 60000, 60000, 0, 11, 6507, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Thatcher - In Combat - Cast \'Battle Roar\' (Phase 1)'),
+(2061, 0, 4, 0, 0, 1, 100, 0, 800, 800, 60000, 60000, 0, 11, 13730, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Thatcher - In Combat - Cast \'Demoralizing Shout\' (Phase 1)'),
+(2061, 0, 5, 0, 7, 1, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Thatcher - On Evade - Despawn In 1500 ms (Phase 1)'),
+(2061, 0, 6, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Thatcher - On Evade - Despawn In 1500 ms'),
+(2062, 0, 0, 1, 2, 0, 25, 1, 70, 80, 0, 0, 0, 36, 1893, 15, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hendricks - Between 70-80% Health - Update Template To \'Moonrage Sentry\' (No Repeat)'),
+(2062, 0, 1, 2, 61, 0, 100, 0, 70, 80, 0, 0, 0, 11, 24085, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hendricks - Between 70-80% Health - Cast \'Transform Visual\' (No Repeat)'),
+(2062, 0, 2, 0, 61, 0, 100, 0, 70, 80, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hendricks - Between 70-80% Health - Set Event Phase 1 (No Repeat)'),
+(2062, 0, 3, 0, 0, 1, 100, 0, 100, 100, 60000, 60000, 0, 11, 6507, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hendricks - In Combat - Cast \'Battle Roar\' (Phase 1)'),
+(2062, 0, 4, 0, 0, 1, 100, 0, 800, 800, 60000, 60000, 0, 11, 13730, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hendricks - In Combat - Cast \'Demoralizing Shout\' (Phase 1)'),
+(2062, 0, 5, 0, 7, 1, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hendricks - On Evade - Despawn In 1500 ms (Phase 1)'),
+(2062, 0, 6, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hendricks - On Evade - Despawn In 1500 ms'),
+(2063, 0, 0, 1, 2, 0, 25, 1, 70, 80, 0, 0, 0, 36, 1893, 15, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Wilhelm - Between 70-80% Health - Update Template To \'Moonrage Sentry\' (No Repeat)'),
+(2063, 0, 1, 2, 61, 0, 100, 0, 70, 80, 0, 0, 0, 11, 24085, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Wilhelm - Between 70-80% Health - Cast \'Transform Visual\' (No Repeat)'),
+(2063, 0, 2, 0, 61, 0, 100, 0, 70, 80, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Wilhelm - Between 70-80% Health - Set Event Phase 1 (No Repeat)'),
+(2063, 0, 3, 0, 0, 1, 100, 0, 100, 100, 60000, 60000, 0, 11, 6507, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Wilhelm - In Combat - Cast \'Battle Roar\' (Phase 1)'),
+(2063, 0, 4, 0, 0, 1, 100, 0, 800, 800, 60000, 60000, 0, 11, 13730, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Wilhelm - In Combat - Cast \'Demoralizing Shout\' (Phase 1)'),
+(2063, 0, 5, 0, 7, 1, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Wilhelm - On Evade - Despawn In 1500 ms (Phase 1)'),
+(2063, 0, 6, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Wilhelm - On Evade - Despawn In 1500 ms'),
+(2064, 0, 0, 1, 2, 0, 25, 1, 70, 80, 0, 0, 0, 36, 1893, 15, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hartin - Between 70-80% Health - Update Template To \'Moonrage Sentry\' (No Repeat)'),
+(2064, 0, 1, 2, 61, 0, 100, 0, 70, 80, 0, 0, 0, 11, 24085, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hartin - Between 70-80% Health - Cast \'Transform Visual\' (No Repeat)'),
+(2064, 0, 2, 0, 61, 0, 100, 0, 70, 80, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hartin - Between 70-80% Health - Set Event Phase 1 (No Repeat)'),
+(2064, 0, 3, 0, 0, 1, 100, 0, 100, 100, 60000, 60000, 0, 11, 6507, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hartin - In Combat - Cast \'Battle Roar\' (Phase 1)'),
+(2064, 0, 4, 0, 0, 1, 100, 0, 800, 800, 60000, 60000, 0, 11, 13730, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hartin - In Combat - Cast \'Demoralizing Shout\' (Phase 1)'),
+(2064, 0, 5, 0, 7, 1, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hartin - On Evade - Despawn In 1500 ms (Phase 1)'),
+(2064, 0, 6, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Hartin - On Evade - Despawn In 1500 ms'),
+(2065, 0, 0, 1, 2, 0, 25, 1, 70, 80, 0, 0, 0, 36, 1893, 15, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Cooper - Between 70-80% Health - Update Template To \'Moonrage Sentry\' (No Repeat)'),
+(2065, 0, 1, 2, 61, 0, 100, 0, 70, 80, 0, 0, 0, 11, 24085, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Cooper - Between 70-80% Health - Cast \'Transform Visual\' (No Repeat)'),
+(2065, 0, 2, 0, 61, 0, 100, 0, 70, 80, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Cooper - Between 70-80% Health - Set Event Phase 1 (No Repeat)'),
+(2065, 0, 3, 0, 0, 1, 100, 0, 100, 100, 60000, 60000, 0, 11, 6507, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Cooper - In Combat - Cast \'Battle Roar\' (Phase 1)'),
+(2065, 0, 4, 0, 0, 1, 100, 0, 800, 800, 60000, 60000, 0, 11, 13730, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Cooper - In Combat - Cast \'Demoralizing Shout\' (Phase 1)'),
+(2065, 0, 5, 0, 7, 1, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Cooper - On Evade - Despawn In 1500 ms (Phase 1)'),
+(2065, 0, 6, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Cooper - On Evade - Despawn In 1500 ms'),
+(2066, 0, 0, 1, 2, 0, 25, 1, 70, 80, 0, 0, 0, 36, 1893, 15, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Higarth - Between 70-80% Health - Update Template To \'Moonrage Sentry\' (No Repeat)'),
+(2066, 0, 1, 2, 61, 0, 100, 0, 70, 80, 0, 0, 0, 11, 24085, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Higarth - Between 70-80% Health - Cast \'Transform Visual\' (No Repeat)'),
+(2066, 0, 2, 0, 61, 0, 100, 0, 70, 80, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Higarth - Between 70-80% Health - Set Event Phase 1 (No Repeat)'),
+(2066, 0, 3, 0, 0, 1, 100, 0, 100, 100, 60000, 60000, 0, 11, 6507, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Higarth - In Combat - Cast \'Battle Roar\' (Phase 1)'),
+(2066, 0, 4, 0, 0, 1, 100, 0, 800, 800, 60000, 60000, 0, 11, 13730, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Higarth - In Combat - Cast \'Demoralizing Shout\' (Phase 1)'),
+(2066, 0, 5, 0, 7, 1, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Higarth - On Evade - Despawn In 1500 ms (Phase 1)'),
+(2066, 0, 6, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Higarth - On Evade - Despawn In 1500 ms'),
+(2067, 0, 0, 1, 2, 0, 25, 1, 70, 80, 0, 0, 0, 36, 1893, 15, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Brunswick - Between 70-80% Health - Update Template To \'Moonrage Sentry\' (No Repeat)'),
+(2067, 0, 1, 2, 61, 0, 100, 0, 70, 80, 0, 0, 0, 11, 24085, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Brunswick - Between 70-80% Health - Cast \'Transform Visual\' (No Repeat)'),
+(2067, 0, 2, 0, 61, 0, 100, 0, 70, 80, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Brunswick - Between 70-80% Health - Set Event Phase 1 (No Repeat)'),
+(2067, 0, 3, 0, 0, 1, 100, 0, 100, 100, 60000, 60000, 0, 11, 6507, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Brunswick - In Combat - Cast \'Battle Roar\' (Phase 1)'),
+(2067, 0, 4, 0, 0, 1, 100, 0, 800, 800, 60000, 60000, 0, 11, 13730, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Brunswick - In Combat - Cast \'Demoralizing Shout\' (Phase 1)'),
+(2067, 0, 5, 0, 7, 1, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Brunswick - On Evade - Despawn In 1500 ms (Phase 1)'),
+(2067, 0, 6, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Councilman Brunswick - On Evade - Despawn In 1500 ms'),
+(2068, 0, 0, 1, 2, 0, 25, 1, 70, 80, 0, 0, 0, 36, 1893, 15, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lord Mayor Morrison - Between 70-80% Health - Update Template To \'Moonrage Sentry\' (No Repeat)'),
+(2068, 0, 1, 2, 61, 0, 100, 0, 70, 80, 0, 0, 0, 11, 24085, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lord Mayor Morrison - Between 70-80% Health - Cast \'Transform Visual\' (No Repeat)'),
+(2068, 0, 2, 0, 61, 0, 100, 0, 70, 80, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Lord Mayor Morrison - Between 70-80% Health - Set Event Phase 1 (No Repeat)'),
+(2068, 0, 3, 0, 0, 1, 100, 0, 100, 100, 60000, 60000, 0, 11, 6507, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lord Mayor Morrison - In Combat - Cast \'Battle Roar\' (Phase 1)'),
+(2068, 0, 4, 0, 0, 1, 100, 0, 800, 800, 60000, 60000, 0, 11, 13730, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Lord Mayor Morrison - In Combat - Cast \'Demoralizing Shout\' (Phase 1)'),
+(2068, 0, 5, 0, 7, 1, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lord Mayor Morrison - On Evade - Despawn In 1500 ms (Phase 1)'),
+(2068, 0, 6, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lord Mayor Morrison - On Evade - Despawn In 1500 ms');
diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
index a7fa25e97..f1896b4fa 100644
--- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
@@ -144,9 +144,9 @@ static float PyrewoodSpawnPoints[3][4] =
     {-397.44f, 1511.09f, 18.67f, 0},
     */
     //door
-    {-396.17f, 1505.86f, 19.77f, 0},
-    {-396.91f, 1505.77f, 19.77f, 0},
-    {-397.94f, 1504.74f, 19.77f, 0},
+    {-397.018219f, 1510.208740f, 18.868748f, 4.731330f},
+    {-397.018219f, 1510.208740f, 18.868748f, 4.731330f},
+    {-397.018219f, 1510.208740f, 18.868748f, 4.731330f},
 };
 
 #define WAIT_SECS 6000
@@ -229,7 +229,7 @@ public:
                 if (!target)
                     target = me;
 
-                summoned->setFaction(168);
+                summoned->setFaction(123);
                 summoned->AddThreat(target, 32.0f);
                 summoned->AI()->AttackStart(target);
             }
@@ -291,6 +291,7 @@ public:
                     SummonCreatureWithRandomTarget(2065, 0);
                     break;
                 case 4:
+                    SummonCreatureWithRandomTarget(2066, 1);
                     SummonCreatureWithRandomTarget(2066, 1);
                     SummonCreatureWithRandomTarget(2067, 0);
                     SummonCreatureWithRandomTarget(2068, 2);