Scripts/Quest: Update & convert to SAI 'Willix the Importer' (#31138)

3 files changed, 198 insertions, 142 deletions

diff --git a/sql/updates/world/3.3.5/2025_09_07_00_world.sql b/sql/updates/world/3.3.5/2025_09_07_00_world.sql
new file mode 100644
index 00000000000..0a1334f6b2a
--- /dev/null
+++ b/sql/updates/world/3.3.5/2025_09_07_00_world.sql
@@ -0,0 +1,198 @@
+--
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 4508;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4508 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 450800 AND 450808 AND `source_type` = 9;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `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
+(4508,0,0,0,19,0,100,0,1144,0,0,0,0,80,450800,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Quest 'Willix the Importer' Taken - Run Script"),
+
+(450800,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Store Targetlist"),
+(450800,9,1,0,0,0,100,0,0,0,0,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Set Faction 250"),
+(450800,9,2,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Remove NPC Flag Questgiver"),
+(450800,9,3,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 0"),
+(450800,9,4,0,0,0,100,0,5000,5000,0,0,0,53,0,450800,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Start Waypoint"),
+
+(4508,0,1,0,58,0,100,0,0,450800,0,0,0,80,450801,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Waypoint Finished - Run Script"),
+
+(450801,9,0,0,0,0,100,0,1000,1000,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 1"),
+(450801,9,1,0,0,0,100,0,3000,3000,0,0,0,53,0,450801,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Start Waypoint"),
+
+(4508,0,2,0,58,0,100,0,0,450801,0,0,0,80,450802,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Waypoint Finished - Run Script"),
+
+(450802,9,0,0,0,0,100,0,1000,1000,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 2"),
+(450802,9,1,0,0,0,100,0,0,0,0,0,0,53,0,450802,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Start Waypoint"),
+
+(4508,0,3,0,58,0,100,0,0,450802,0,0,0,80,450803,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Waypoint Finished - Run Script"),
+
+(450803,9,0,0,0,0,100,0,1000,1000,0,0,0,1,3,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 3"),
+(450803,9,1,0,0,0,100,0,0,0,0,0,0,53,0,450803,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Start Waypoint"),
+
+(4508,0,4,0,58,0,100,0,0,450803,0,0,0,80,450804,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Waypoint Finished - Run Script"),
+
+(450804,9,0,0,0,0,100,0,1000,1000,0,0,0,1,4,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 4"),
+(450804,9,1,0,0,0,100,0,0,0,0,0,0,107,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Summon Group 0"),
+(450804,9,2,0,0,0,100,0,0,0,0,0,0,53,0,450804,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Start Waypoint"),
+
+(4508,0,5,0,58,0,100,0,0,450804,0,0,0,80,450805,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Waypoint Finished - Run Script"),
+
+(450805,9,0,0,0,0,100,0,1000,1000,0,0,0,1,5,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 5"),
+(450805,9,1,0,0,0,100,0,0,0,0,0,0,53,0,450805,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Start Waypoint"),
+
+(4508,0,6,0,58,0,100,0,0,450805,0,0,0,80,450806,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Waypoint Finished - Run Script"),
+
+(450806,9,0,0,0,0,100,0,1000,1000,0,0,0,1,6,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 6"),
+(450806,9,1,0,0,0,100,0,0,0,0,0,0,53,0,450806,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Start Waypoint"),
+
+(4508,0,7,0,58,0,100,0,0,450806,0,0,0,80,450807,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Waypoint Finished - Run Script"),
+
+(450807,9,0,0,0,0,100,0,1000,1000,0,0,0,1,7,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 7"),
+(450807,9,1,0,0,0,100,0,0,0,0,0,0,107,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Summon Group 1"),
+(450807,9,2,0,0,0,100,0,5000,5000,0,0,0,1,8,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 8"),
+(450807,9,3,0,0,0,100,0,0,0,0,0,0,15,1144,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Quest Credit 'Willix the Importer'"),
+(450807,9,4,0,0,0,100,0,0,0,0,0,0,2,69,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Set Faction 69"),
+(450807,9,5,0,0,0,100,0,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Add Npc Flag Questgiver"),
+-- Below guessed
+(450807,9,6,0,0,0,100,0,180000,180000,0,0,0,1,9,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Script - Say Line 9"),
+(450807,9,7,0,0,0,100,0,0,0,0,0,0,53,0,450807,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Start Waypoint"),
+
+(4508,0,8,0,58,0,100,0,0,450807,0,0,0,80,450808,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Waypoint Finished - Run Script"),
+
+(450808,9,0,0,0,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Willix the Importer - On Script - Despawn Instant"),
+
+(4508,0,9,0,4,0,15,0,0,0,0,0,0,1,10,0,1,0,0,0,7,0,0,0,0,0,0,0,0,"Willix the Importer - On Aggro - Say Line 10"),
+
+(4508,0,10,0,6,0,100,0,0,0,0,0,0,6,1144,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Willix the Importer - On Death - Fail Quest 'Willix the Importer'");
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId` = 4508 AND `summonerType` = 0;
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
+(4508,0,0,4514,2145.7168,1726.6263,51.936977,2.721183538436889648,4,60000,"Willix the Importer - Group 0 - Raging Agam'ar"),
+(4508,0,0,4514,2148.4658,1732.5813,51.897450,3.228859186172485351,4,60000,"Willix the Importer - Group 0 - Raging Agam'ar"),
+(4508,0,1,4514,1967.0083,1598.4280,81.058530,3.273414373397827148,4,60000,"Willix the Importer - Group 1 - Raging Agam'ar"),
+(4508,0,1,4514,1969.7242,1601.2389,80.431830,3.298672199249267578,4,60000,"Willix the Importer - Group 1 - Raging Agam'ar");
+
+DELETE FROM `script_waypoint` WHERE `entry` = 4508;
+DELETE FROM `waypoints` WHERE `entry` BETWEEN 450800 AND 450807;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(450800,1,2184.9822,1835.0039,59.86851,"Willix the Importer"),
+
+(450801,1,2166.6384,1854.7162,57.592236,"Willix the Importer"),
+(450801,2,2157.3577,1854.9065,55.602158,"Willix the Importer"),
+(450801,3,2153.4673,1852.6602,53.291454,"Willix the Importer"),
+(450801,4,2142.7424,1844.9857,48.762497,"Willix the Importer"),
+(450801,5,2137.1711,1840.3002,47.91533,"Willix the Importer"),
+(450801,6,2135.8704,1832.2656,46.650414,"Willix the Importer"),
+(450801,7,2135.7842,1822.5825,46.77384,"Willix the Importer"),
+(450801,8,2134.418,1814.5844,46.781307,"Willix the Importer"),
+(450801,9,2127.0889,1805.0176,46.83733,"Willix the Importer"),
+(450801,10,2120.1821,1798.7981,47.37992,"Willix the Importer"),
+(450801,11,2113.5994,1795.7913,47.761383,"Willix the Importer"),
+
+(450802,1,2097.2703,1789.3093,50.87806,"Willix the Importer"),
+(450802,2,2089.8,1786.4364,52.51884,"Willix the Importer"),
+(450802,3,2083.5083,1784.7682,53.985424,"Willix the Importer"),
+(450802,4,2077.7734,1783.3955,55.2612,"Willix the Importer"),
+(450802,5,2073.533,1779.6217,55.803577,"Willix the Importer"),
+(450802,6,2066.229,1772.921,57.292404,"Willix the Importer"),
+(450802,7,2059.8037,1771.465,58.410603,"Willix the Importer"),
+(450802,8,2052.2012,1770.2249,58.824398,"Willix the Importer"),
+(450802,9,2042.7672,1766.2555,60.009483,"Willix the Importer"),
+
+(450803,1,2035.2274,1753.339,60.447002,"Willix the Importer"),
+(450803,2,2033.9052,1745.2197,60.466377,"Willix the Importer"),
+(450803,3,2033.8594,1735.5001,60.753407,"Willix the Importer"),
+(450803,4,2034.8206,1726.9822,60.627968,"Willix the Importer"),
+(450803,5,2036.9271,1721.6207,60.200397,"Willix the Importer"),
+(450803,6,2039.4012,1716.8102,60.01561,"Willix the Importer"),
+(450803,7,2046.3212,1709.4685,59.614483,"Willix the Importer"),
+(450803,8,2051.8352,1704.3961,59.011375,"Willix the Importer"),
+(450803,9,2060.3647,1701.6138,58.468163,"Willix the Importer"),
+(450803,10,2071.5977,1701.4401,57.24946,"Willix the Importer"),
+(450803,11,2080.6086,1703.4143,56.65886,"Willix the Importer"),
+(450803,12,2090.0396,1706.752,56.50015,"Willix the Importer"),
+(450803,13,2100.1792,1715.869,54.63017,"Willix the Importer"),
+
+(450804,1,2111.7773,1727.5934,53.578506,"Willix the Importer"),
+(450804,2,2121.4128,1732.7437,52.923294,"Willix the Importer"),
+(450804,3,2129.9978,1734.7412,52.065136,"Willix the Importer"),
+(450804,4,2137.6743,1734.5045,51.93174,"Willix the Importer"),
+(450804,5,2147.1538,1730.2831,51.765865,"Willix the Importer"),
+(450804,6,2156.225,1723.2633,52.14113,"Willix the Importer"),
+(450804,7,2161.0212,1715.5737,53.069454,"Willix the Importer"),
+(450804,8,2163.305,1706.8594,54.337376,"Willix the Importer"),
+(450804,9,2163.6943,1696.58,55.472157,"Willix the Importer"),
+(450804,10,2160.4727,1690.9844,56.782005,"Willix the Importer"),
+(450804,11,2155.5955,1686.1584,57.875053,"Willix the Importer"),
+(450804,12,2149.8132,1680.13,58.0093,"Willix the Importer"),
+(450804,13,2143.8298,1676.6147,58.00794,"Willix the Importer"),
+(450804,14,2135.929,1673.4115,58.434864,"Willix the Importer"),
+(450804,15,2129.5115,1672.1378,58.938347,"Willix the Importer"),
+(450804,16,2120.024,1670.6798,59.023964,"Willix the Importer"),
+(450804,17,2112.1594,1670.3827,59.18009,"Willix the Importer"),
+(450804,18,2103.4446,1671.734,59.17758,"Willix the Importer"),
+(450804,19,2099.0474,1672.6481,59.88399,"Willix the Importer"),
+(450804,20,2088.258,1673.1373,61.252632,"Willix the Importer"),
+(450804,21,2081.069,1669.8579,61.24878,"Willix the Importer"),
+(450804,22,2074.7048,1664.9502,61.231228,"Willix the Importer"),
+(450804,23,2068.138,1658.0231,61.240517,"Willix the Importer"),
+(450804,24,2065.1865,1651.5103,61.203484,"Willix the Importer"),
+(450804,25,2063.264,1642.8959,62.12069,"Willix the Importer"),
+(450804,26,2063.9106,1637.3577,63.62475,"Willix the Importer"),
+(450804,27,2064.3074,1631.4198,64.49529,"Willix the Importer"),
+(450804,28,2064.2214,1609.5265,62.38478,"Willix the Importer"),
+
+(450805,1,2061.4136,1594.0212,62.913113,"Willix the Importer"),
+(450805,2,2060.8352,1587.7548,63.50159,"Willix the Importer"),
+(450805,3,2060.92,1581.7162,63.989983,"Willix the Importer"),
+(450805,4,2060.5627,1568.6227,66.582245,"Willix the Importer"),
+(450805,5,2059.0796,1562.1904,67.90953,"Willix the Importer"),
+(450805,6,2057.4543,1555.9479,69.81415,"Willix the Importer"),
+(450805,7,2054.8723,1551.19,71.85053,"Willix the Importer"),
+(450805,8,2046.2444,1544.615,75.84767,"Willix the Importer"),
+(450805,9,2040.5182,1543.5066,77.81182,"Willix the Importer"),
+(450805,10,2034.842,1543.4518,79.505844,"Willix the Importer"),
+(450805,11,2027.8698,1538.7988,80.94072,"Willix the Importer"),
+
+(450806,1,2020.8691,1539.2756,80.820175,"Willix the Importer"),
+(450806,2,2016.0541,1548.2653,81.073814,"Willix the Importer"),
+(450806,3,2012.8672,1553.107,80.72809,"Willix the Importer"),
+(450806,4,2006.2244,1559.5234,81.05614,"Willix the Importer"),
+(450806,5,2004.6276,1563.7064,81.24209,"Willix the Importer"),
+(450806,6,2003.7891,1572.111,81.85367,"Willix the Importer"),
+(450806,7,2001.1139,1582.8323,81.204994,"Willix the Importer"),
+(450806,8,1999.6489,1588.7372,80.62329,"Willix the Importer"),
+(450806,9,1993.3217,1598.7571,79.51372,"Willix the Importer"),
+(450806,10,1987.9791,1600.7035,79.683815,"Willix the Importer"),
+(450806,11,1978.8535,1600.8456,79.8718,"Willix the Importer"),
+(450806,12,1972.4584,1600.3914,80.34419,"Willix the Importer"),
+(450806,13,1965.8403,1599.5803,80.78863,"Willix the Importer"),
+(450806,14,1958.7689,1598.06,81.400314,"Willix the Importer"),
+(450806,15,1952.7817,1587.8278,81.90723,"Willix the Importer"),
+(450806,16,1951.8091,1583.4639,81.855774,"Willix the Importer"),
+(450806,17,1950.7427,1578.7097,81.07914,"Willix the Importer"),
+-- Below guessed
+(450807,1,1939.151,1541.1406,82.5006,"Willix the Importer");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 4508;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(4508,0,0,"Woo hoo! Finally getting out of here. It's going to be rough though. Keep your eyes peeled for trouble.",12,0,100,1,0,0,1482,0,"Willix the Importer"),
+(4508,1,0,"Up there is where Charlga Razorflank resides. Blasted old crone.",12,0,100,25,0,0,1483,0,"Willix the Importer"),
+(4508,2,0,"There's blueleaf tuber in this trench! It's like gold waiting to be mined I tell you!",12,0,100,1,0,0,1484,0,"Willix the Importer"),
+(4508,3,0,"There could be danger around every corner here.",12,0,100,1,0,0,1485,0,"Willix the Importer"),
+(4508,4,0,"I don't see how these foul animals live in this place... sheesh it smells!",12,0,100,1,0,0,1486,0,"Willix the Importer"),
+(4508,5,0,"I think I see a way for us to get out of this big twisted mess of a bramble.",12,0,100,1,0,0,1487,0,"Willix the Importer"),
+(4508,6,0,"Glad to be out of that wretched trench. Not much nicer up here though!",12,0,100,1,0,0,1488,0,"Willix the Importer"),
+(4508,7,0,"Finally! I'll be glad to get out of this place.",12,0,100,1,0,0,1490,0,"Willix the Importer"),
+(4508,8,0,"I think I'll rest a moment and catch my breath before heading back to Ratchet. Thanks for all the help!",12,0,100,1,0,0,1493,0,"Willix the Importer"),
+(4508,9,0,"Well, I'm off to Ratchet now! Best of luck to you!",12,0,100,0,0,0,1494,0,"Willix the Importer"),
+
+(4508,10,0,"Eek! $n coming right at us!",12,0,100,0,0,0,1544,0,"Willix the Importer"),
+(4508,10,1,"Egads! $n on me!",12,0,100,0,0,0,1545,0,"Willix the Importer"),
+(4508,10,2,"$n heading this way fast! To arms!",12,0,100,0,0,0,1546,0,"Willix the Importer"),
+(4508,10,3,"Help! Get this $n off of me!",12,0,100,0,0,0,1547,0,"Willix the Importer");
+
+DELETE FROM `quest_template_addon` WHERE `ID` = 1144;
+INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `BreadcrumbForQuestId`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
+(1144,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4514 AND `source_type` = 0 AND `id` = 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`,`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
+(4514,0,2,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Raging Agam'ar - On Just Summoned - Start Attack");
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
deleted file mode 100644
index f42ca486a00..00000000000
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ScriptMgr.h"
-#include "PetAI.h"
-#include "Player.h"
-#include "razorfen_kraul.h"
-#include "ScriptedEscortAI.h"
-#include "SpellScript.h"
-
-enum Willix
-{
-    SAY_READY                   = 0,
-    SAY_POINT                   = 1,
-    SAY_AGGRO1                  = 2,
-    SAY_BLUELEAF                = 3,
-    SAY_DANGER                  = 4,
-    SAY_BAD                     = 5,
-    SAY_THINK                   = 6,
-    SAY_SOON                    = 7,
-    SAY_FINALY                  = 8,
-    SAY_WIN                     = 9,
-    SAY_END                     = 10,
-
-    QUEST_WILLIX_THE_IMPORTER   = 1144,
-    ENTRY_BOAR                  = 4514
-};
-
-class npc_willix : public CreatureScript
-{
-public:
-    npc_willix() : CreatureScript("npc_willix") { }
-
-    struct npc_willixAI : public EscortAI
-    {
-        npc_willixAI(Creature* creature) : EscortAI(creature) { }
-
-        void OnQuestAccept(Player* player, Quest const* quest) override
-        {
-            if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER)
-            {
-                Start(true, false, player->GetGUID());
-                Talk(SAY_READY, player);
-                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
-            }
-        }
-
-        void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
-        {
-            Player* player = GetPlayerForEscort();
-            if (!player)
-                return;
-
-            switch (waypointId)
-            {
-                case 3:
-                    me->HandleEmoteCommand(EMOTE_STATE_POINT);
-                    Talk(SAY_POINT, player);
-                    break;
-                case 4:
-                    me->SummonCreature(ENTRY_BOAR, 2137.66f, 1843.98f, 48.08f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25s);
-                    break;
-                case 8:
-                    Talk(SAY_BLUELEAF, player);
-                    break;
-                case 9:
-                    Talk(SAY_DANGER, player);
-                    break;
-                case 13:
-                    Talk(SAY_BAD, player);
-                    break;
-                case 14:
-                    me->SummonCreature(ENTRY_BOAR, 2078.91f, 1704.54f, 56.77f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25s);
-                    break;
-                case 25:
-                    Talk(SAY_THINK, player);
-                    break;
-                case 31:
-                    Talk(SAY_SOON, player);
-                    break;
-                case 42:
-                    Talk(SAY_FINALY, player);
-                    break;
-                case 43:
-                    me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25s);
-                    break;
-                case 45:
-                    Talk(SAY_WIN, player);
-                    me->SetNpcFlag(UNIT_NPC_FLAG_QUESTGIVER);
-                    player->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me);
-                    break;
-                case 46:
-                    Talk(SAY_END, player);
-                    break;
-            }
-        }
-
-        void Reset() override { }
-
-        void JustEngagedWith(Unit* who) override
-        {
-            Talk(SAY_AGGRO1, who);
-        }
-
-        void JustSummoned(Creature* summoned) override
-        {
-            summoned->AI()->AttackStart(me);
-        }
-
-        void JustDied(Unit* /*killer*/) override
-        {
-            if (Player* player = GetPlayerForEscort())
-                player->FailQuest(QUEST_WILLIX_THE_IMPORTER);
-        }
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetRazorfenKraulAI<npc_willixAI>(creature);
-    }
-};
-
-void AddSC_razorfen_kraul()
-{
-    new npc_willix();
-}
diff --git a/src/server/scripts/Kalimdor/kalimdor_script_loader.cpp b/src/server/scripts/Kalimdor/kalimdor_script_loader.cpp
index 2c7a766e0a2..37ca6be8878 100644
--- a/src/server/scripts/Kalimdor/kalimdor_script_loader.cpp
+++ b/src/server/scripts/Kalimdor/kalimdor_script_loader.cpp
@@ -73,7 +73,6 @@ void AddSC_boss_amnennar_the_coldbringer();
 void AddSC_razorfen_downs();
 void AddSC_instance_razorfen_downs();
 // Razorfen Kraul
-void AddSC_razorfen_kraul();
 void AddSC_instance_razorfen_kraul();
 // Ruins of ahn'qiraj
 void AddSC_boss_kurinnaxx();
@@ -188,7 +187,6 @@ void AddKalimdorScripts()
     AddSC_razorfen_downs();
     AddSC_instance_razorfen_downs();
     // Razorfen Kraul
-    AddSC_razorfen_kraul();
     AddSC_instance_razorfen_kraul();
     // Ruins of ahn'qiraj
     AddSC_boss_kurinnaxx();