*Merge

--HG--
branch : trunk

8 files changed, 417 insertions, 13 deletions

diff --git a/sql/updates/5036_character_updates_dual_spec.sql b/sql/updates/5036_character_updates_dual_spec.sql
index 1718a70c554..b345755f298 100644
--- a/sql/updates/5036_character_updates_dual_spec.sql
+++ b/sql/updates/5036_character_updates_dual_spec.sql
@@ -20,10 +20,12 @@ CREATE TABLE `character_talent` (
   PRIMARY KEY (`guid`,`spell`,`spec`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-/* The below DELETE query should remove all known talents from `character_spell`,
-   talents gathered by rockzOr of getmangos.com and updated/fixed by oc_redfox of trinitycore.org.
-   This update should (probably) only be run once, on your characters database before enabling Dual Spec.. */
-DELETE FROM `character_spell` WHERE `spell` IN (724,974,1329,3674,5570,5923,5924,5925,5926,5952,9452,9453,9799,10060,11069,11070,11071,11078,11080,11083,11094,11095,11100,11103,11108,11113,11115,11119,11120,11124,11129,11151,11160,11170,11175,11180,11185,11189,11190,11207,11210,11213,11222,11232,11237,11242,11247,11252,11255,11366,11367,11368,11426,11958,12042,12043,12163,12281,12282,12284,12285,12286,12287,12289,12290,12292,12294,12295,12296,12297,12298,12299,12300,12301,12308,12311,12312,12313,12317,12318,12319,12320,12321,12322,12323,12324,12328,12329,12330,12338,12339,12340,12341,12349,12350,12351,12353,12357,12358,12378,12398,12399,12400,12463,12464,12467,12469,12472,12473,12487,12488,12489,12490,12496,12497,12500,12501,12502,12503,12518,12519,12569,12571,12574,12575,12576,12577,12592,12598,12605,12606,12658,12663,12664,12665,12666,12668,12672,12676,12677,12697,12700,12701,12702,12703,12704,12711,12712,12724,12725,12726,12727,12750,12751,12752,12753,12761,12762,12763,12764,12781,12783,12784,12785,12797,12799,12803,12804,12809,12810,12811,12812,12813,12814,12815,12818,12834,12835,12839,12840,12846,12847,12848,12849,12852,12853,12855,12856,12857,12858,12860,12861,12862,12867,12872,12873,12876,12877,12878,12879,12950,12952,12953,12958,12959,12960,12963,12971,12972,12973,12974,12975,12982,12983,12999,13000,13001,13002,13043,13045,13046,13047,13048,13705,13706,13709,13712,13713,13715,13732,13733,13741,13742,13743,13750,13754,13788,13789,13790,13791,13792,13793,13800,13801,13802,13803,13804,13805,13806,13807,13832,13843,13844,13845,13848,13849,13851,13852,13853,13854,13863,13865,13866,13867,13872,13875,13877,13958,13960,13961,13962,13963,13964,13970,13971,13975,13976,13979,13980,13981,13983,14057,14062,14063,14066,14070,14071,14072,14076,14079,14080,14082,14083,14094,14113,14114,14115,14116,14117,14128,14132,14135,14136,14137,14138,14139,14140,14141,14142,14144,14148,14156,14158,14159,14160,14161,14162,14163,14164,14165,14166,14168,14169,14171,14172,14173,14174,14175,14176,14177,14179,14183,14185,14186,14190,14193,14194,14195,14251,14278,14520,14521,14522,14523,14531,14747,14748,14749,14750,14751,14752,14767,14768,14769,14770,14771,14772,14774,14776,14777,14780,14781,14782,14783,14784,14785,14788,14789,14790,14791,14889,14892,14898,14901,14908,14909,14910,14911,14912,14913,14983,15008,15009,15010,15011,15012,15013,15014,15017,15018,15020,15028,15029,15030,15031,15047,15058,15059,15060,15257,15259,15260,15268,15270,15272,15273,15274,15275,15286,15307,15308,15309,15310,15311,15312,15313,15314,15316,15317,15318,15320,15323,15324,15325,15326,15327,15328,15331,15332,15335,15336,15337,15338,15349,15354,15355,15356,15362,15363,15392,15407,15448,15473,15487,16035,16038,16039,16040,16041,16043,16086,16089,16105,16106,16107,16108,16109,16110,16111,16112,16113,16114,16115,16116,16130,16160,16161,16164,16166,16173,16176,16178,16179,16180,16181,16182,16184,16187,16188,16190,16194,16196,16198,16205,16206,16207,16208,16209,16210,16211,16212,16213,16214,16215,16216,16217,16218,16219,16220,16221,16222,16223,16224,16225,16226,16227,16228,16229,16230,16232,16235,16240,16252,16254,16255,16256,16258,16259,16261,16262,16266,16268,16271,16272,16281,16282,16283,16284,16287,16290,16293,16295,16302,16303,16304,16305,16306,16307,16308,16309,16462,16463,16464,16465,16466,16487,16489,16492,16493,16494,16511,16513,16514,16515,16538,16539,16540,16541,16542,16544,16578,16579,16580,16581,16582,16757,16758,16763,16765,16766,16769,16770,16814,16815,16816,16817,16818,16819,16820,16821,16822,16833,16834,16835,16836,16839,16840,16845,16846,16847,16850,16858,16859,16860,16861,16862,16864,16880,16896,16897,16899,16909,16910,16911,16912,16913,16923,16924,16929,16930,16931,16934,16935,16936,16937,16938,16940,16941,16942,16943,16944,16947,16948,16949,16966,16968,16972,16974,16975,16998,16999,17002,17003,17004,17005,17006,17007,17050,17051,17056,17058,17059,17060,17061,17063,17065,17066,17069,17070,17071,17072,17073,17074,17075,17076,17077,17078,17104,17106,17107,17108,17111,17112,17113,17116,17118,17119,17120,17123,17124,17191,17322,17323,17364,17485,17486,17487,17488,17489,17778,17779,17780,17783,17784,17785,17788,17789,17790,17791,17792,17793,17796,17801,17802,17803,17804,17805,17810,17811,17812,17813,17814,17815,17833,17834,17877,17917,17918,17927,17929,17930,17954,17955,17956,17957,17958,17959,17962,18073,18094,18095,18096,18119,18120,18126,18127,18130,18135,18136,18174,18175,18176,18179,18180,18182,18183,18213,18218,18219,18220,18223,18265,18271,18272,18273,18274,18275,18288,18372,18427,18428,18429,18459,18460,18462,18463,18464,18530,18531,18533,18534,18535,18551,18552,18553,18554,18555,18562,18692,18693,18694,18695,18696,18697,18698,18699,18700,18701,18703,18704,18705,18706,18707,18708,18709,18710,18731,18743,18744,18754,18755,18756,18767,18768,18769,18770,18771,18772,18773,18788,18821,18822,18827,18829,19028,19159,19160,19168,19180,19181,19184,19228,19232,19233,19236,19255,19256,19257,19258,19259,19286,19287,19290,19294,19295,19297,19298,19306,19370,19371,19373,19376,19386,19387,19388,19407,19412,19416,19417,19418,19419,19420,19421,19422,19423,19426,19427,19429,19430,19431,19434,19454,19455,19456,19461,19462,19464,19465,19466,19485,19487,19488,19489,19490,19498,19499,19500,19503,19506,19507,19508,19509,19510,19511,19549,19550,19551,19552,19553,19554,19555,19556,19559,19560,19572,19573,19574,19575,19577,19578,19583,19584,19585,19586,19587,19590,19592,19596,19596,19596,19598,19599,19600,19601,19602,19609,19610,19612,19616,19617,19618,19619,19620,19621,19622,19623,19624,19625,20042,20045,20049,20056,20057,20060,20061,20062,20063,20064,20066,20091,20092,20096,20097,20098,20099,20100,20101,20102,20103,20104,20105,20111,20112,20113,20117,20118,20119,20120,20121,20127,20130,20135,20138,20139,20140,20143,20144,20145,20146,20147,20174,20175,20177,20179,20180,20181,20182,20196,20197,20198,20199,20200,20205,20206,20207,20208,20209,20210,20212,20213,20214,20215,20216,20217,20224,20225,20234,20235,20237,20238,20239,20243,20244,20245,20254,20255,20256,20257,20258,20259,20260,20261,20262,20263,20264,20265,20266,20330,20331,20332,20335,20336,20337,20359,20360,20361,20375,20468,20469,20470,20473,20487,20488,20489,20496,20500,20501,20502,20503,20504,20505,20711,20895,20911,20925,23145,23145,23584,23585,23586,23587,23588,23695,23785,23822,23823,23824,23825,23881,23989,24283,24296,24297,24443,24691,24858,24866,24894,24943,24944,24945,24946,24968,24969,24970,24971,24972,25829,25836,25956,25957,25988,26016,26022,26023,27789,27790,27811,27815,27816,27839,27840,27900,27901,27902,27903,27904,28332,28574,28592,28593,28996,28997,28998,28999,29000,29062,29064,29065,29074,29075,29076,29079,29080,29082,29084,29086,29140,29143,29144,29179,29180,29187,29189,29191,29192,29193,29202,29205,29206,29438,29439,29440,29441,29444,29447,29590,29591,29592,29593,29594,29598,29599,29623,29721,29723,29724,29725,29759,29760,29761,29762,29763,29776,29787,29790,29792,29801,29834,29836,29838,29859,29888,29889,30054,30057,30060,30061,30062,30063,30064,30108,30143,30144,30145,30146,30160,30242,30245,30246,30247,30248,30283,30288,30289,30290,30291,30292,30293,30295,30296,30299,30301,30302,30319,30320,30321,30326,30327,30328,30664,30665,30666,30672,30673,30674,30675,30678,30679,30680,30681,30706,30798,30802,30808,30809,30810,30811,30812,30813,30814,30816,30818,30819,30823,30864,30865,30866,30867,30868,30869,30872,30873,30881,30883,30884,30885,30886,30892,30893,30894,30895,30902,30903,30904,30905,30906,30919,30920,31122,31123,31124,31126,31130,31131,31208,31209,31211,31212,31213,31216,31217,31218,31219,31220,31221,31222,31223,31226,31227,31228,31229,31230,31234,31235,31236,31244,31245,31380,31382,31383,31569,31570,31571,31572,31574,31575,31579,31582,31583,31584,31585,31586,31587,31588,31589,31638,31639,31640,31641,31642,31656,31657,31658,31661,31667,31668,31669,31670,31672,31674,31675,31676,31677,31678,31679,31680,31682,31683,31687,31785,31821,31822,31823,31825,31826,31828,31829,31830,31833,31835,31836,31837,31838,31839,31840,31841,31842,31844,31845,31848,31849,31850,31851,31852,31853,31854,31858,31859,31860,31866,31867,31868,31869,31871,31872,31876,31877,31878,31879,31880,31881,31882,31883,31935,32043,32381,32382,32383,32385,32387,32392,32393,32394,32477,32483,32484,32601,33142,33145,33146,33150,33154,33158,33159,33160,33161,33162,33167,33171,33172,33174,33182,33186,33190,33191,33192,33193,33201,33202,33203,33206,33213,33214,33215,33221,33222,33223,33224,33225,33371,33589,33590,33591,33592,33596,33597,33599,33600,33601,33602,33603,33604,33605,33606,33607,33776,33831,33851,33852,33853,33855,33856,33859,33866,33867,33872,33873,33879,33880,33881,33882,33883,33886,33887,33888,33889,33890,33891,33917,33956,33957,34151,34152,34153,34293,34295,34296,34297,34300,34453,34454,34455,34459,34460,34462,34464,34465,34466,34467,34468,34469,34470,34475,34476,34482,34483,34484,34485,34486,34487,34488,34489,34490,34491,34492,34493,34494,34496,34497,34498,34499,34500,34502,34503,34506,34507,34508,34692,34753,34838,34839,34859,34860,34861,34908,34909,34910,34911,34912,34914,34935,34938,34939,34948,34949,34950,34954,35029,35030,35100,35102,35103,35104,35110,35111,35363,35364,35395,35396,35397,35446,35448,35449,35541,35550,35551,35552,35553,35578,35581,35691,35692,35693,36554,37116,37117,43338,44378,44379,44394,44395,44396,44397,44398,44399,44400,44402,44403,44404,44425,44440,44441,44442,44443,44445,44446,44448,44449,44457,44469,44470,44471,44472,44543,44545,44546,44548,44549,44557,44560,44561,44566,44567,44568,44570,44571,44572,44745,45234,45243,45244,46854,46855,46859,46860,46865,46866,46867,46908,46909,46910,46911,46913,46914,46915,46917,46924,46945,46949,46951,46952,46953,46968,47193,47195,47196,47197,47198,47199,47200,47201,47202,47203,47204,47205,47220,47221,47223,47230,47231,47236,47237,47238,47239,47240,47245,47246,47247,47258,47259,47260,47266,47267,47268,47269,47270,47294,47295,47296,47507,47508,47509,47511,47515,47516,47517,47535,47536,47537,47538,47539,47540,47549,47551,47552,47555,47556,47557,47558,47559,47560,47562,47564,47565,47566,47567,47569,47570,47571,47572,47573,47577,47578,47580,47581,47582,47585,47586,47587,47588,47788,48079,48080,48081,48181,48384,48389,48392,48393,48395,48396,48409,48410,48411,48412,48432,48433,48434,48438,48483,48484,48485,48488,48489,48491,48492,48494,48495,48496,48499,48500,48505,48506,48510,48511,48514,48516,48521,48525,48532,48535,48536,48537,48539,48544,48545,48962,48963,48965,48977,48978,48979,48982,48985,48987,48988,48997,49004,49005,49006,49013,49015,49016,49018,49023,49024,49027,49028,49032,49036,49039,49042,49137,49140,49143,49145,49146,49149,49157,49158,49175,49182,49184,49186,49188,49189,49194,49200,49202,49203,49206,49208,49217,49219,49220,49222,49223,49224,49226,49377,49390,49391,49392,49393,49394,49395,49455,49467,49471,49477,49478,49479,49480,49483,49488,49489,49490,49491,49495,49497,49500,49501,49503,49504,49508,49509,49526,49529,49530,49531,49532,49533,49534,49538,49542,49543,49562,49564,49565,49567,49568,49571,49572,49588,49589,49599,49610,49611,49612,49614,49627,49628,49631,49632,49633,49635,49636,49638,49654,49655,49657,49661,49662,49663,49664,49786,49787,49788,49789,49790,49791,49796,50029,50031,50033,50034,50040,50041,50043,50115,50117,50118,50119,50120,50121,50127,50128,50129,50130,50137,50138,50147,50148,50149,50150,50151,50152,50154,50187,50190,50191,50334,50365,50371,50384,50385,50391,50392,50516,50685,50686,50687,50720,50796,50880,50884,50885,50886,50887,51052,51099,51108,51109,51123,51127,51128,51129,51130,51160,51161,51166,51167,51179,51180,51181,51182,51183,51267,51268,51269,51271,51456,51459,51462,51463,51464,51465,51466,51468,51470,51472,51473,51474,51478,51479,51480,51481,51482,51483,51485,51486,51490,51521,51522,51523,51524,51525,51526,51527,51528,51529,51530,51531,51532,51533,51554,51555,51556,51557,51558,51560,51561,51562,51563,51564,51565,51566,51625,51626,51627,51628,51629,51632,51633,51634,51635,51636,51662,51664,51665,51667,51668,51669,51672,51674,51679,51682,51685,51686,51687,51688,51689,51690,51692,51696,51698,51700,51701,51708,51709,51710,51711,51712,51713,51745,51746,51881,51883,51884,51885,51886,52143,52234,52456,52783,52785,52786,52787,52788,52795,52797,52798,52799,52800,52802,52803,52825,52858,52858,52858,53137,53138,53175,53176,53178,53179,53180,53181,53182,53182,53182,53183,53183,53183,53184,53184,53184,53186,53187,53203,53204,53205,53209,53215,53216,53217,53221,53222,53224,53228,53232,53234,53237,53238,53241,53243,53244,53245,53246,53252,53253,53256,53259,53260,53262,53263,53264,53265,53270,53290,53291,53292,53293,53294,53295,53296,53297,53298,53299,53301,53302,53303,53304,53375,53376,53379,53380,53381,53382,53383,53384,53385,53401,53409,53409,53409,53411,53411,53411,53426,53427,53427,53427,53429,53429,53429,53430,53430,53430,53434,53450,53451,53476,53477,53478,53480,53481,53482,53483,53484,53485,53486,53488,53490,53497,53501,53502,53503,53508,53511,53512,53514,53516,53517,53519,53527,53530,53551,53552,53553,53554,53555,53556,53557,53563,53569,53576,53583,53585,53590,53591,53592,53595,53620,53621,53622,53648,53660,53661,53671,53673,53695,53696,53709,53710,53711,53754,53759,54037,54038,54044,54117,54118,54151,54154,54155,54347,54348,54349,54354,54486,54488,54489,54490,54637,54638,54639,54646,54658,54659,54734,54747,54749,54787,55050,55061,55062,55090,55091,55092,55094,55107,55108,55129,55130,55131,55132,55133,55136,55198,55225,55226,55233,55236,55237,55339,55340,55610,55620,55623,55666,55667,55668,55669,55670,55709,56314,56315,56316,56317,56318,56333,56336,56337,56339,56340,56341,56342,56343,56344,56611,56612,56613,56614,56636,56637,56638,56822,56834,56835,56924,56927,56929,56930,56931,56932,57470,57472,57499,57810,57811,57812,57813,57814,57849,57850,57851,57865,57873,57876,57877,57878,57880,57881,58410,58413,58414,58415,58422,58423,58424,58425,58426,58435,58436,58437,58872,58874,59057,59088,59089,59295,59296,59297,59298,59672,59738,59739,59740,59741,60103,60184,60185,60187,60188,60970,61154,61155,61156,61157,61158,61216,61221,61222,61295,61329,61330,61331,61336,61345,61346,61433,61434,61680,61680,61680,61681,61681,61681,61682,61682,61682,61683,61683,61683,61684,61684,61685,61685,61686,61686,61686,61687,61687,61687,61688,61688,61688,61689,61689,61689,61690,61690,61690,62097,62098,62099,62100,62101,62758,62759,62760,62762,62764,62765,62905,62908,63108,63117,63121,63123,63156,63158,63245,63349,63350,63351,63370,63372,63373,63374,63410,63411,63457,63458,63503,63504,63505,63506,63534,63542,63543,63560,63574,63625,63626,63627,63646,63647,63648,63649,63650,63730,63733,63737,63900,64044,64127,64129,64205,64353,64357,64976,65139);
+/* Drethek - This should be all talents without major rank of learned spells: */
+DELETE FROM `character_spell` WHERE `spell` IN (724,974,1329,5570,5923,5924,5925,5926,5952,9452,9453,9799,10060,11069,11070,11071,11078,11080,11083,11094,11095,11100,11103,11108,11113,11115,11119,11120,11124,11129,11151,11160,11170,11175,11180,11185,11189,11190,11207,11210,11213,11222,11232,11237,11242,11247,11252,11255,11366,11367,11368,11426,11958,12042,12043,12163,12281,12282,12284,12285,12286,12287,12289,12290,12292,12294,12295,12296,12297,12298,12299,12300,12301,12308,12311,12312,12313,12317,12318,12319,12320,12321,12322,12323,12324,12328,12329,12330,12338,12339,12340,12341,12349,12350,12351,12353,12357,12358,12378,12398,12399,12400,12463,12464,12467,12469,12472,12473,12487,12488,12489,12490,12496,12497,12500,12501,12502,12503,12518,12519,12569,12571,12574,12575,12576,12577,12592,12598,12605,12606,12658,12663,12664,12665,12666,12668,12672,12676,12677,12697,12700,12701,12702,12703,12704,12711,12712,12724,12725,12726,12727,12750,12751,12752,12753,12761,12762,12763,12764,12781,12783,12784,12785,12797,12799,12803,12804,12809,12810,12811,12812,12813,12814,12815,12818,12834,12835,12839,12840,12846,12847,12848,12849,12852,12853,12855,12856,12857,12858,12860,12861,12862,12867,12872,12873,12876,12877,12878,12879,12950,12952,12953,12958,12959,12960,12963,12971,12972,12973,12974,12975,12982,12983,12999,13000,13001,13002,13043,13045,13046,13047,13048,13705,13706,13709,13712,13713,13715,13732,13733,13741,13742,13743,13750,13754,13788,13789,13792,13793,13800,13801,13802,13803,13804,13805,13806,13807,13832,13843,13844,13845,13848,13849,13851,13852,13853,13854,13863,13865,13866,13867,13872,13875,13877,13958,13960,13961,13962,13963,13964,13970,13971,13975,13976,13979,13980,13981,13983,14057,14062,14063,14066,14070,14071,14072,14076,14079,14080,14082,14083,14094,14113,14114,14115,14116,14117,14128,14132,14135,14136,14137,14138,14139,14140,14141,14142,14144,14148,14156,14158,14159,14160,14161,14162,14163,14164,14165,14166,14168,14169,14171,14172,14173,14174,14175,14176,14177,14179,14183,14185,14186,14190,14193,14194,14195,14251,14278,14520,14521,14522,14523,14531,14747,14748,14749,14750,14751,14767,14768,14769,14770,14771,14772,14774,14776,14777,14780,14781,14784,14785,14788,14789,14790,14791,14889,14892,14898,14901,14908,14909,14910,14911,14912,14913,14983,15008,15009,15010,15011,15012,15013,15014,15017,15018,15020,15028,15029,15030,15031,15047,15058,15059,15060,15257,15259,15260,15270,15272,15273,15274,15275,15286,15307,15308,15309,15310,15311,15312,15313,15314,15316,15317,15318,15320,15327,15328,15331,15332,15335,15336,15337,15338,15349,15354,15355,15356,15362,15363,15392,15407,15448,15473,15487,16035,16038,16039,16040,16041,16043,16086,16089,16105,16106,16107,16108,16109,16110,16111,16112,16113,16114,16115,16116,16130,16160,16161,16164,16166,16173,16176,16178,16179,16180,16181,16182,16184,16187,16188,16190,16194,16196,16198,16205,16206,16209,16210,16211,16212,16213,16214,16215,16216,16217,16218,16219,16220,16221,16222,16223,16224,16225,16226,16227,16228,16229,16230,16232,16235,16240,16252,16254,16255,16256,16258,16259,16261,16262,16266,16268,16271,16272,16281,16282,16283,16284,16287,16290,16293,16295,16302,16303,16304,16305,16306,16307,16308,16309,16462,16463,16464,16465,16466,16487,16489,16492,16493,16494,16511,16513,16514,16515,16538,16539,16540,16541,16542,16544,16578,16579,16580,16581,16582,16757,16758,16763,16765,16766,16769,16770,16814,16815,16816,16817,16818,16819,16820,16821,16822,16833,16834,16835,16836,16839,16840,16845,16846,16847,16850,16858,16859,16860,16861,16862,16864,16880,16896,16897,16899,16909,16910,16911,16912,16913,16923,16924,16929,16930,16931,16934,16935,16936,16937,16938,16940,16941,16942,16943,16944,16947,16948,16949,16966,16968,16972,16974,16975,16998,16999,17002,17003,17004,17005,17006,17007,17050,17051,17056,17058,17059,17060,17061,17063,17065,17066,17069,17070,17071,17072,17073,17074,17075,17076,17077,17078,17104,17106,17107,17108,17111,17112,17113,17116,17118,17119,17120,17123,17124,17191,17322,17323,17364,17485,17486,17487,17488,17489,17778,17779,17780,17783,17784,17785,17788,17789,17790,17791,17792,17793,17796,17801,17802,17803,17804,17805,17810,17811,17812,17813,17814,17815,17833,17834,17877,17917,17918,17927,17929,17930,17954,17955,17956,17957,17958,17959,17962,18073,18094,18095,18096,18119,18120,18126,18127,18130,18135,18136,18174,18175,18176,18179,18180,18182,18183,18213,18218,18219,18220,18223,18271,18272,18273,18274,18275,18288,18372,18427,18428,18429,18459,18460,18462,18463,18464,18530,18531,18533,18534,18535,18551,18552,18553,18554,18555,18562,18692,18693,18694,18695,18696,18697,18698,18699,18703,18704,18705,18706,18707,18708,18709,18710,18731,18743,18744,18754,18755,18756,18767,18768,18769,18770,18771,18772,18773,18827,18829,19028,19159,19160,19168,19180,19181,19184,19236,19255,19256,19257,19258,19259,19286,19287,19290,19294,19295,19297,19298,19306,19370,19371,19373,19376,19386,19387,19388,19407,19412,19416,19417,19418,19419,19420,19421,19422,19423,19426,19427,19429,19430,19431,19434,19454,19455,19456,19461,19462,19464,19465,19466,19485,19487,19488,19489,19490,19498,19499,19500,19503,19506,19507,19508,19509,19549,19550,19551,19552,19553,19554,19555,19556,19559,19560,19572,19573,19574,19575,19577,19578,19583,19584,19585,19586,19587,19590,19592,19598,19599,19600,19601,19602,19609,19610,19612,19616,19617,19618,19619,19620,19621,19622,19623,19624,19625,20042,20045,20049,20056,20057,20060,20061,20062,20063,20064,20066,20096,20097,20098,20099,20100,20101,20102,20103,20104,20105,20111,20112,20113,20117,20118,20119,20120,20121,20127,20130,20135,20138,20139,20140,20143,20144,20145,20146,20147,20174,20175,20177,20179,20180,20181,20182,20196,20197,20198,20205,20206,20207,20208,20209,20210,20212,20213,20214,20215,20216,20224,20225,20234,20235,20237,20238,20239,20243,20244,20245,20254,20255,20256,20257,20258,20259,20260,20261,20262,20263,20264,20265,20266,20330,20331,20332,20335,20336,20337,20359,20360,20361,20375,20468,20469,20470,20473,20487,20488,20496,20500,20501,20502,20503,20504,20505,20711,20895,20911,20925,23584,23585,23586,23587,23588,23695,23785,23822,23823,23824,23825,23881,23989,24283,24296,24297,24443,24691,24858,24866,24894,24943,24944,24945,24946,24968,24969,24970,24971,24972,25829,25836,25956,25957,25988,26016,26022,26023,27789,27790,27811,27815,27816,27839,27840,27900,27901,27902,27903,27904,28332,28574,28592,28593,28996,28997,28998,28999,29000,29062,29064,29065,29074,29075,29076,29079,29080,29082,29084,29086,29140,29143,29144,29179,29180,29187,29189,29191,29192,29193,29202,29205,29206,29438,29439,29440,29441,29444,29447,29590,29591,29592,29593,29594,29598,29599,29623,29721,29723,29724,29725,29759,29760,29761,29762,29763,29776,29787,29790,29792,29801,29834,29836,29838,29859,29888,29889,30054,30057,30060,30061,30062,30063,30064,30108,30143,30144,30145,30146,30160,30242,30245,30246,30247,30248,30283,30288,30289,30290,30291,30292,30293,30295,30296,30299,30301,30302,30319,30320,30321,30326,30664,30665,30666,30672,30673,30674,30675,30678,30679,30706,30798,30802,30808,30809,30812,30813,30814,30816,30818,30819,30823,30864,30865,30866,30867,30868,30869,30872,30873,30881,30883,30884,30885,30886,30892,30893,30894,30895,30902,30903,30904,30905,30906,30919,30920,31122,31123,31124,31126,31130,31131,31208,31209,31211,31212,31213,31216,31217,31218,31219,31220,31221,31222,31223,31226,31227,31228,31229,31230,31244,31245,31380,31382,31383,31569,31570,31571,31572,31574,31575,31579,31582,31583,31584,31585,31586,31587,31588,31589,31638,31639,31640,31641,31642,31656,31657,31658,31661,31667,31668,31669,31670,31672,31674,31675,31676,31677,31678,31679,31680,31682,31683,31687,31785,31821,31822,31823,31825,31826,31828,31829,31830,31833,31835,31836,31837,31838,31839,31840,31841,31842,31844,31845,31848,31849,31850,31851,31852,31858,31859,31860,31866,31867,31868,31869,31871,31872,31876,31877,31878,31879,31880,31881,31935,32043,32381,32382,32383,32385,32387,32392,32393,32394,32477,32483,32484,32601,33142,33145,33146,33150,33154,33158,33159,33160,33161,33162,33167,33171,33172,33186,33190,33191,33192,33193,33201,33202,33206,33213,33214,33215,33221,33222,33223,33224,33225,33371,33589,33590,33591,33592,33596,33597,33599,33600,33601,33602,33603,33604,33605,33606,33607,33776,33831,33851,33852,33853,33855,33856,33859,33866,33867,33872,33873,33879,33880,33881,33882,33883,33886,33887,33888,33889,33890,33917,33956,33957,34151,34152,34153,34293,34295,34296,34297,34300,34453,34454,34455,34459,34460,34462,34464,34465,34466,34467,34468,34469,34470,34475,34476,34482,34483,34484,34485,34486,34487,34488,34489,34490,34491,34492,34493,34494,34496,34497,34498,34499,34500,34502,34503,34506,34507,34508,34692,34753,34838,34839,34859,34860,34861,34908,34909,34910,34914,34935,34938,34939,34948,34949,34950,34954,35029,35030,35100,35102,35104,35110,35111,35363,35364,35395,35396,35397,35446,35448,35449,35541,35550,35551,35552,35553,35578,35581,35691,35692,35693,36554,37116,37117,43338,44378,44379,44394,44395,44396,44397,44398,44399,44400,44402,44403,44404,44425,44442,44443,44445,44446,44448,44449,44457,44469,44470,44471,44472,44543,44545,44546,44548,44549,44557,44560,44561,44566,44567,44568,44570,44571,44572,44745,45234,45243,45244,46854,46855,46859,46860,46865,46866,46867,46908,46909,46910,46911,46913,46914,46915,46917,46924,46945,46949,46951,46952,46953,46968,47193,47195,47196,47197,47198,47199,47200,47201,47202,47203,47204,47205,47220,47221,47223,47230,47231,47236,47237,47238,47239,47240,47245,47246,47247,47258,47259,47260,47266,47267,47268,47269,47270,47294,47295,47296,47507,47508,47509,47511,47515,47516,47517,47535,47536,47537,47540,47558,47559,47560,47562,47564,47565,47566,47567,47569,47570,47573,47577,47578,47580,47581,47582,47585,47586,47587,47588,47788,48181,48384,48389,48392,48393,48395,48396,48409,48410,48411,48412,48432,48433,48434,48438,48483,48484,48485,48488,48489,48491,48492,48494,48495,48496,48499,48500,48505,48506,48510,48511,48514,48516,48521,48525,48532,48535,48536,48537,48539,48544,48545,48962,48963,48965,48977,48978,48979,48982,48985,48987,48988,48997,49004,49005,49006,49013,49015,49016,49018,49023,49024,49027,49028,49032,49036,49039,49042,49137,49140,49143,49145,49146,49149,49158,49175,49182,49184,49186,49188,49189,49194,49200,49202,49203,49206,49208,49217,49219,49220,49222,49223,49224,49226,49377,49390,49391,49392,49393,49394,49395,49455,49467,49471,49477,49478,49479,49480,49483,49488,49489,49490,49491,49495,49497,49500,49501,49503,49504,49508,49509,49526,49529,49530,49533,49534,49538,49542,49543,49562,49564,49565,49567,49568,49571,49572,49588,49589,49599,49610,49611,49627,49628,49631,49632,49633,49635,49636,49638,49654,49655,49657,49661,49662,49663,49664,49786,49787,49788,49789,49790,49791,49796,50029,50031,50033,50034,50040,50041,50043,50115,50117,50118,50119,50120,50121,50127,50128,50129,50130,50137,50138,50147,50149,50150,50151,50152,50154,50187,50190,50191,50334,50365,50371,50384,50385,50391,50392,50516,50685,50686,50687,50720,50796,50880,50884,50885,50886,50887,51052,51099,51108,51109,51123,51127,51128,51129,51130,51160,51161,51166,51167,51179,51180,51181,51182,51183,51267,51268,51269,51271,51456,51459,51462,51463,51464,51465,51466,51468,51470,51472,51473,51474,51478,51479,51480,51481,51482,51483,51485,51486,51490,51521,51522,51523,51524,51525,51526,51527,51528,51529,51530,51531,51532,51533,51554,51555,51556,51557,51558,51560,51561,51562,51563,51564,51565,51566,51625,51626,51627,51628,51629,51632,51633,51634,51635,51636,51662,51664,51665,51667,51668,51669,51672,51674,51679,51682,51685,51686,51687,51688,51689,51690,51692,51696,51698,51700,51701,51708,51709,51710,51711,51712,51713,51745,51746,51881,51883,51884,51885,51886,52143,52456,52783,52785,52786,52787,52788,52795,52797,52798,52799,52800,52802,52803,53137,53138,53209,53215,53216,53217,53221,53222,53224,53228,53232,53234,53237,53238,53241,53243,53244,53245,53246,53252,53253,53256,53259,53260,53262,53263,53264,53265,53270,53290,53291,53292,53295,53296,53297,53298,53299,53301,53302,53303,53304,53375,53376,53379,53380,53381,53382,53385,53484,53486,53488,53501,53502,53503,53519,53527,53530,53551,53552,53553,53556,53557,53563,53569,53576,53583,53585,53590,53591,53592,53595,53620,53621,53622,53648,53660,53661,53671,53673,53695,53696,53709,53710,53711,53754,53759,54037,54038,54117,54118,54151,54154,54155,54347,54348,54349,54354,54486,54488,54489,54490,54637,54638,54639,54646,54658,54659,54734,54747,54749,54787,55050,55061,55062,55090,55091,55092,55094,55107,55108,55129,55130,55131,55132,55133,55136,55198,55225,55226,55233,55236,55237,55339,55340,55610,55620,55623,55666,55667,56314,56315,56316,56317,56318,56333,56336,56337,56339,56340,56341,56342,56343,56344,56611,56612,56613,56614,56636,56637,56638,56822,56834,56835,56924,56927,56929,56930,56931,56932,57470,57472,57499,57810,57811,57812,57813,57814,57849,57850,57851,57865,57873,57876,57877,57878,57880,57881,58410,58413,58414,58415,58422,58423,58424,58425,58426,58435,58872,58874,59057,59088,59089,59672,59738,59739,59740,59741,60103,60184,60185,60187,60188,60970,61154,61155,61156,61157,61158,61216,61221,61222,61295,61329,61330,61331,61336,61345,61346,62097,62098,62099,62100,62101,62905,62908,63108,63117,63121,63123,63156,63158,63245,63349,63350,63351,63370,63372,63373,63374,63410,63411,63457,63458,63503,63504,63505,63506,63534,63542,63543,63560,63574,63625,63626,63627,63646,63647,63648,63649,63650,63730,63733,63737,64044,64127,64129,64205,64353,64357,64976,65139,65661,66191,66192,66799,66814,66815,66816,66817);
+
+/* XTElite1 - Talents that teach an initial skill, and you learn higher ranks from a trainer. Here's a cleanup query that will remove all those: */
+DELETE FROM `character_spell` WHERE `spell` IN (12505,12522,12523,12524,12525,12526,13018,13019,13020,13021,13031,13032,13033,16979,17311,17312,17313,17314,17347,17348,18807,18809,18867,18868,18869,18870,18871,18937,18938,19238,19240,19241,19242,19243,20900,20901,20902,20903,20904,20909,20910,21551,21552,21553,24132,24133,24974,24975,24976,24977,25248,25387,25437,26864,27013,27065,27067,27068,27132,27133,27134,27263,27265,27870,27871,28275,30016,30022,30330,30404,30405,30413,30414,30546,32593,32594,33041,33042,33043,33405,33876,33878,33933,33938,33982,33983,33986,33987,34411,34412,34413,34863,34864,34865,34866,34916,34917,42890,42891,42944,42945,42949,42950,43038,43039,44780,44781,47485,47486,47497,47498,47826,47827,47841,47843,47846,47847,48086,48087,48088,48089,48155,48156,48159,48160,48172,48173,48468,48563,48564,48565,48566,48660,48663,48666,48998,48999,49011,49012,49049,49050,49283,49284,49376,53005,53006,53007,53199,53200,53201,53223,53225,53226,53227,53248,53249,53251,55359,55360,57720,57721,57722,59092,59156,59158,59159,59161,59163,59164,59170,59171,59172,60051,60052,60053,61299,61300,61301,61384);
+
 ALTER TABLE `characters` ADD `speccount` tinyint(3) unsigned NOT NULL default 1 AFTER `arena_pending_points`;
 ALTER TABLE `characters` ADD `activespec` tinyint(3) unsigned NOT NULL default 0 AFTER `speccount`;
 
diff --git a/sql/updates/5084_character_updates_dual_spec.sql b/sql/updates/5084_character_updates_dual_spec.sql
deleted file mode 100644
index c6cdacf0d69..00000000000
--- a/sql/updates/5084_character_updates_dual_spec.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-
-/* Begin intentional error */
-"Run 5084_character_updates_dual_spec.sql manually, or don't run it at all. This is only intended for people who need to clean up missed talents from r5036. If you never used r5036 - 5083, ignore this.";
-
-/* This is what you're supposed to run manually, for those of you reading this:
-
-DELETE FROM `character_spell` WHERE `spell` IN (12505,12522,12523,12524,12525,12526,13018,13019,13020,13021,13031,13032,13033,17311,17312,17313,17314,17347,17348,18807,18809,18867,18868,18869,18870,18871,18937,18938,19238,19240,19241,19242,19243,20900,20901,20902,20903,20904,20909,20910,20929,20930,21551,21552,21553,24132,24133,24974,24975,24976,24977,25248,25387,25437,25899,26864,27013,27065,27067,27068,27132,27133,27134,27174,27263,27265,27870,27871,28275,30016,30022,30330,30404,30405,30413,30414,30546,32593,32594,32699,32700,33041,33042,33043,33072,33405,33891,33933,33938,33982,33983,33986,33987,34411,34412,34413,34863,34864,34865,34866,34916,34917,42890,42891,42944,42945,42949,42950,43038,43039,44780,44781,47485,47486,47497,47498,47826,47827,47841,47843,47846,47847,48086,48087,48088,48089,48155,48156,48159,48160,48172,48173,48468,48563,48564,48565,48566,48660,48663,48666,48824,48825,48826,48827,48998,48999,49011,49012,49049,49050,49283,49284,51325,51326,51327,51328,51376,51378,51379,51409,51410,51411,51416,51417,51418,51419,53005,53006,53007,53199,53200,53201,53223,53225,53226,53248,53249,53251,55258,55259,55260,55261,55262,55265,55268,55270,55271,55359,55360,57720,57721,57722,59092,59156,59158,59159,59161,59163,59164,59170,59171,59172,60051,61299,61300,61301,61384,63668,63669,63670,63671,63672,66052,66053);
-
-*/
diff --git a/sql/updates/5092_world_scripts.sql b/sql/updates/5092_world_scripts.sql
new file mode 100644
index 00000000000..bd9535181af
--- /dev/null
+++ b/sql/updates/5092_world_scripts.sql
@@ -0,0 +1 @@
+UPDATE creature_template SET ScriptName='npc_tracy_proudwell' WHERE entry=18266;
diff --git a/sql/updates/5093_world_spell_proc_event.sql b/sql/updates/5093_world_spell_proc_event.sql
new file mode 100644
index 00000000000..8bda907de25
--- /dev/null
+++ b/sql/updates/5093_world_spell_proc_event.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_proc_event` WHERE `entry`IN(44546, 44548, 44549);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+( 44546, 0x00,   3, 0x00100220, 0x00001000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Brain Freeze (Rank 1)
+( 44548, 0x00,   3, 0x00100220, 0x00001000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Brain Freeze (Rank 2)
+( 44549, 0x00,   3, 0x00100220, 0x00001000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0); -- Brain Freeze (Rank 3)
\ No newline at end of file
diff --git a/sql/updates/5096_world_scripts.sql b/sql/updates/5096_world_scripts.sql
new file mode 100644
index 00000000000..37bf49f3d7d
--- /dev/null
+++ b/sql/updates/5096_world_scripts.sql
@@ -0,0 +1,12 @@
+UPDATE creature_template SET ScriptName='npc_tapoke_slim_jahn' WHERE entry=4962;
+UPDATE creature_template SET ScriptName='npc_mikhail' WHERE entry=4963;
+
+DELETE FROM script_waypoint WHERE entry=4962;
+INSERT INTO script_waypoint VALUES
+(4962, 0, -3804.438965, -828.048035, 10.093068, 0, ''),
+(4962, 1, -3803.934326, -835.772400, 10.077722, 0, ''),
+(4962, 2, -3792.629150, -835.670898,  9.655657, 0, ''),
+(4962, 3, -3772.433838, -835.345947, 10.868981, 0, ''),
+(4962, 4, -3765.937256, -840.128601, 10.885593, 0, ''),
+(4962, 5, -3738.633789, -830.997498, 11.057384, 0, ''),
+(4962, 6, -3690.224121, -862.261597,  9.960449, 0, '');
diff --git a/sql/updates/5097_character_updates_dual_spec.sql b/sql/updates/5097_character_updates_dual_spec.sql
new file mode 100644
index 00000000000..13f5f4b6d20
--- /dev/null
+++ b/sql/updates/5097_character_updates_dual_spec.sql
@@ -0,0 +1,13 @@
+
+/* Begin intentional error */
+"Run 5097_character_updates_dual_spec.sql manually, or don't run it at all. This is only intended for people who need to clean up missed skills from r5036. If you never used r5036 - 5096, ignore this. Tell your users to reset their talents (or just switch specs) to fix their talent points.";
+
+/*
+
+-- Drethek - This should be all talents without a learned spell as a major rank:
+DELETE FROM `character_spell` WHERE `spell` IN (724,974,1329,5570,5923,5924,5925,5926,5952,9452,9453,9799,10060,11069,11070,11071,11078,11080,11083,11094,11095,11100,11103,11108,11113,11115,11119,11120,11124,11129,11151,11160,11170,11175,11180,11185,11189,11190,11207,11210,11213,11222,11232,11237,11242,11247,11252,11255,11366,11367,11368,11426,11958,12042,12043,12163,12281,12282,12284,12285,12286,12287,12289,12290,12292,12294,12295,12296,12297,12298,12299,12300,12301,12308,12311,12312,12313,12317,12318,12319,12320,12321,12322,12323,12324,12328,12329,12330,12338,12339,12340,12341,12349,12350,12351,12353,12357,12358,12378,12398,12399,12400,12463,12464,12467,12469,12472,12473,12487,12488,12489,12490,12496,12497,12500,12501,12502,12503,12518,12519,12569,12571,12574,12575,12576,12577,12592,12598,12605,12606,12658,12663,12664,12665,12666,12668,12672,12676,12677,12697,12700,12701,12702,12703,12704,12711,12712,12724,12725,12726,12727,12750,12751,12752,12753,12761,12762,12763,12764,12781,12783,12784,12785,12797,12799,12803,12804,12809,12810,12811,12812,12813,12814,12815,12818,12834,12835,12839,12840,12846,12847,12848,12849,12852,12853,12855,12856,12857,12858,12860,12861,12862,12867,12872,12873,12876,12877,12878,12879,12950,12952,12953,12958,12959,12960,12963,12971,12972,12973,12974,12975,12982,12983,12999,13000,13001,13002,13043,13045,13046,13047,13048,13705,13706,13709,13712,13713,13715,13732,13733,13741,13742,13743,13750,13754,13788,13789,13792,13793,13800,13801,13802,13803,13804,13805,13806,13807,13832,13843,13844,13845,13848,13849,13851,13852,13853,13854,13863,13865,13866,13867,13872,13875,13877,13958,13960,13961,13962,13963,13964,13970,13971,13975,13976,13979,13980,13981,13983,14057,14062,14063,14066,14070,14071,14072,14076,14079,14080,14082,14083,14094,14113,14114,14115,14116,14117,14128,14132,14135,14136,14137,14138,14139,14140,14141,14142,14144,14148,14156,14158,14159,14160,14161,14162,14163,14164,14165,14166,14168,14169,14171,14172,14173,14174,14175,14176,14177,14179,14183,14185,14186,14190,14193,14194,14195,14251,14278,14520,14521,14522,14523,14531,14747,14748,14749,14750,14751,14767,14768,14769,14770,14771,14772,14774,14776,14777,14780,14781,14784,14785,14788,14789,14790,14791,14889,14892,14898,14901,14908,14909,14910,14911,14912,14913,14983,15008,15009,15010,15011,15012,15013,15014,15017,15018,15020,15028,15029,15030,15031,15047,15058,15059,15060,15257,15259,15260,15270,15272,15273,15274,15275,15286,15307,15308,15309,15310,15311,15312,15313,15314,15316,15317,15318,15320,15327,15328,15331,15332,15335,15336,15337,15338,15349,15354,15355,15356,15362,15363,15392,15407,15448,15473,15487,16035,16038,16039,16040,16041,16043,16086,16089,16105,16106,16107,16108,16109,16110,16111,16112,16113,16114,16115,16116,16130,16160,16161,16164,16166,16173,16176,16178,16179,16180,16181,16182,16184,16187,16188,16190,16194,16196,16198,16205,16206,16209,16210,16211,16212,16213,16214,16215,16216,16217,16218,16219,16220,16221,16222,16223,16224,16225,16226,16227,16228,16229,16230,16232,16235,16240,16252,16254,16255,16256,16258,16259,16261,16262,16266,16268,16271,16272,16281,16282,16283,16284,16287,16290,16293,16295,16302,16303,16304,16305,16306,16307,16308,16309,16462,16463,16464,16465,16466,16487,16489,16492,16493,16494,16511,16513,16514,16515,16538,16539,16540,16541,16542,16544,16578,16579,16580,16581,16582,16757,16758,16763,16765,16766,16769,16770,16814,16815,16816,16817,16818,16819,16820,16821,16822,16833,16834,16835,16836,16839,16840,16845,16846,16847,16850,16858,16859,16860,16861,16862,16864,16880,16896,16897,16899,16909,16910,16911,16912,16913,16923,16924,16929,16930,16931,16934,16935,16936,16937,16938,16940,16941,16942,16943,16944,16947,16948,16949,16966,16968,16972,16974,16975,16998,16999,17002,17003,17004,17005,17006,17007,17050,17051,17056,17058,17059,17060,17061,17063,17065,17066,17069,17070,17071,17072,17073,17074,17075,17076,17077,17078,17104,17106,17107,17108,17111,17112,17113,17116,17118,17119,17120,17123,17124,17191,17322,17323,17364,17485,17486,17487,17488,17489,17778,17779,17780,17783,17784,17785,17788,17789,17790,17791,17792,17793,17796,17801,17802,17803,17804,17805,17810,17811,17812,17813,17814,17815,17833,17834,17877,17917,17918,17927,17929,17930,17954,17955,17956,17957,17958,17959,17962,18073,18094,18095,18096,18119,18120,18126,18127,18130,18135,18136,18174,18175,18176,18179,18180,18182,18183,18213,18218,18219,18220,18223,18271,18272,18273,18274,18275,18288,18372,18427,18428,18429,18459,18460,18462,18463,18464,18530,18531,18533,18534,18535,18551,18552,18553,18554,18555,18562,18692,18693,18694,18695,18696,18697,18698,18699,18703,18704,18705,18706,18707,18708,18709,18710,18731,18743,18744,18754,18755,18756,18767,18768,18769,18770,18771,18772,18773,18827,18829,19028,19159,19160,19168,19180,19181,19184,19236,19255,19256,19257,19258,19259,19286,19287,19290,19294,19295,19297,19298,19306,19370,19371,19373,19376,19386,19387,19388,19407,19412,19416,19417,19418,19419,19420,19421,19422,19423,19426,19427,19429,19430,19431,19434,19454,19455,19456,19461,19462,19464,19465,19466,19485,19487,19488,19489,19490,19498,19499,19500,19503,19506,19507,19508,19509,19549,19550,19551,19552,19553,19554,19555,19556,19559,19560,19572,19573,19574,19575,19577,19578,19583,19584,19585,19586,19587,19590,19592,19598,19599,19600,19601,19602,19609,19610,19612,19616,19617,19618,19619,19620,19621,19622,19623,19624,19625,20042,20045,20049,20056,20057,20060,20061,20062,20063,20064,20066,20096,20097,20098,20099,20100,20101,20102,20103,20104,20105,20111,20112,20113,20117,20118,20119,20120,20121,20127,20130,20135,20138,20139,20140,20143,20144,20145,20146,20147,20174,20175,20177,20179,20180,20181,20182,20196,20197,20198,20205,20206,20207,20208,20209,20210,20212,20213,20214,20215,20216,20224,20225,20234,20235,20237,20238,20239,20243,20244,20245,20254,20255,20256,20257,20258,20259,20260,20261,20262,20263,20264,20265,20266,20330,20331,20332,20335,20336,20337,20359,20360,20361,20375,20468,20469,20470,20473,20487,20488,20496,20500,20501,20502,20503,20504,20505,20711,20895,20911,20925,23584,23585,23586,23587,23588,23695,23785,23822,23823,23824,23825,23881,23989,24283,24296,24297,24443,24691,24858,24866,24894,24943,24944,24945,24946,24968,24969,24970,24971,24972,25829,25836,25956,25957,25988,26016,26022,26023,27789,27790,27811,27815,27816,27839,27840,27900,27901,27902,27903,27904,28332,28574,28592,28593,28996,28997,28998,28999,29000,29062,29064,29065,29074,29075,29076,29079,29080,29082,29084,29086,29140,29143,29144,29179,29180,29187,29189,29191,29192,29193,29202,29205,29206,29438,29439,29440,29441,29444,29447,29590,29591,29592,29593,29594,29598,29599,29623,29721,29723,29724,29725,29759,29760,29761,29762,29763,29776,29787,29790,29792,29801,29834,29836,29838,29859,29888,29889,30054,30057,30060,30061,30062,30063,30064,30108,30143,30144,30145,30146,30160,30242,30245,30246,30247,30248,30283,30288,30289,30290,30291,30292,30293,30295,30296,30299,30301,30302,30319,30320,30321,30326,30664,30665,30666,30672,30673,30674,30675,30678,30679,30706,30798,30802,30808,30809,30812,30813,30814,30816,30818,30819,30823,30864,30865,30866,30867,30868,30869,30872,30873,30881,30883,30884,30885,30886,30892,30893,30894,30895,30902,30903,30904,30905,30906,30919,30920,31122,31123,31124,31126,31130,31131,31208,31209,31211,31212,31213,31216,31217,31218,31219,31220,31221,31222,31223,31226,31227,31228,31229,31230,31244,31245,31380,31382,31383,31569,31570,31571,31572,31574,31575,31579,31582,31583,31584,31585,31586,31587,31588,31589,31638,31639,31640,31641,31642,31656,31657,31658,31661,31667,31668,31669,31670,31672,31674,31675,31676,31677,31678,31679,31680,31682,31683,31687,31785,31821,31822,31823,31825,31826,31828,31829,31830,31833,31835,31836,31837,31838,31839,31840,31841,31842,31844,31845,31848,31849,31850,31851,31852,31858,31859,31860,31866,31867,31868,31869,31871,31872,31876,31877,31878,31879,31880,31881,31935,32043,32381,32382,32383,32385,32387,32392,32393,32394,32477,32483,32484,32601,33142,33145,33146,33150,33154,33158,33159,33160,33161,33162,33167,33171,33172,33186,33190,33191,33192,33193,33201,33202,33206,33213,33214,33215,33221,33222,33223,33224,33225,33371,33589,33590,33591,33592,33596,33597,33599,33600,33601,33602,33603,33604,33605,33606,33607,33776,33831,33851,33852,33853,33855,33856,33859,33866,33867,33872,33873,33879,33880,33881,33882,33883,33886,33887,33888,33889,33890,33917,33956,33957,34151,34152,34153,34293,34295,34296,34297,34300,34453,34454,34455,34459,34460,34462,34464,34465,34466,34467,34468,34469,34470,34475,34476,34482,34483,34484,34485,34486,34487,34488,34489,34490,34491,34492,34493,34494,34496,34497,34498,34499,34500,34502,34503,34506,34507,34508,34692,34753,34838,34839,34859,34860,34861,34908,34909,34910,34914,34935,34938,34939,34948,34949,34950,34954,35029,35030,35100,35102,35104,35110,35111,35363,35364,35395,35396,35397,35446,35448,35449,35541,35550,35551,35552,35553,35578,35581,35691,35692,35693,36554,37116,37117,43338,44378,44379,44394,44395,44396,44397,44398,44399,44400,44402,44403,44404,44425,44442,44443,44445,44446,44448,44449,44457,44469,44470,44471,44472,44543,44545,44546,44548,44549,44557,44560,44561,44566,44567,44568,44570,44571,44572,44745,45234,45243,45244,46854,46855,46859,46860,46865,46866,46867,46908,46909,46910,46911,46913,46914,46915,46917,46924,46945,46949,46951,46952,46953,46968,47193,47195,47196,47197,47198,47199,47200,47201,47202,47203,47204,47205,47220,47221,47223,47230,47231,47236,47237,47238,47239,47240,47245,47246,47247,47258,47259,47260,47266,47267,47268,47269,47270,47294,47295,47296,47507,47508,47509,47511,47515,47516,47517,47535,47536,47537,47540,47558,47559,47560,47562,47564,47565,47566,47567,47569,47570,47573,47577,47578,47580,47581,47582,47585,47586,47587,47588,47788,48181,48384,48389,48392,48393,48395,48396,48409,48410,48411,48412,48432,48433,48434,48438,48483,48484,48485,48488,48489,48491,48492,48494,48495,48496,48499,48500,48505,48506,48510,48511,48514,48516,48521,48525,48532,48535,48536,48537,48539,48544,48545,48962,48963,48965,48977,48978,48979,48982,48985,48987,48988,48997,49004,49005,49006,49013,49015,49016,49018,49023,49024,49027,49028,49032,49036,49039,49042,49137,49140,49143,49145,49146,49149,49158,49175,49182,49184,49186,49188,49189,49194,49200,49202,49203,49206,49208,49217,49219,49220,49222,49223,49224,49226,49377,49390,49391,49392,49393,49394,49395,49455,49467,49471,49477,49478,49479,49480,49483,49488,49489,49490,49491,49495,49497,49500,49501,49503,49504,49508,49509,49526,49529,49530,49533,49534,49538,49542,49543,49562,49564,49565,49567,49568,49571,49572,49588,49589,49599,49610,49611,49627,49628,49631,49632,49633,49635,49636,49638,49654,49655,49657,49661,49662,49663,49664,49786,49787,49788,49789,49790,49791,49796,50029,50031,50033,50034,50040,50041,50043,50115,50117,50118,50119,50120,50121,50127,50128,50129,50130,50137,50138,50147,50149,50150,50151,50152,50154,50187,50190,50191,50334,50365,50371,50384,50385,50391,50392,50516,50685,50686,50687,50720,50796,50880,50884,50885,50886,50887,51052,51099,51108,51109,51123,51127,51128,51129,51130,51160,51161,51166,51167,51179,51180,51181,51182,51183,51267,51268,51269,51271,51456,51459,51462,51463,51464,51465,51466,51468,51470,51472,51473,51474,51478,51479,51480,51481,51482,51483,51485,51486,51490,51521,51522,51523,51524,51525,51526,51527,51528,51529,51530,51531,51532,51533,51554,51555,51556,51557,51558,51560,51561,51562,51563,51564,51565,51566,51625,51626,51627,51628,51629,51632,51633,51634,51635,51636,51662,51664,51665,51667,51668,51669,51672,51674,51679,51682,51685,51686,51687,51688,51689,51690,51692,51696,51698,51700,51701,51708,51709,51710,51711,51712,51713,51745,51746,51881,51883,51884,51885,51886,52143,52456,52783,52785,52786,52787,52788,52795,52797,52798,52799,52800,52802,52803,53137,53138,53209,53215,53216,53217,53221,53222,53224,53228,53232,53234,53237,53238,53241,53243,53244,53245,53246,53252,53253,53256,53259,53260,53262,53263,53264,53265,53270,53290,53291,53292,53295,53296,53297,53298,53299,53301,53302,53303,53304,53375,53376,53379,53380,53381,53382,53385,53484,53486,53488,53501,53502,53503,53519,53527,53530,53551,53552,53553,53556,53557,53563,53569,53576,53583,53585,53590,53591,53592,53595,53620,53621,53622,53648,53660,53661,53671,53673,53695,53696,53709,53710,53711,53754,53759,54037,54038,54117,54118,54151,54154,54155,54347,54348,54349,54354,54486,54488,54489,54490,54637,54638,54639,54646,54658,54659,54734,54747,54749,54787,55050,55061,55062,55090,55091,55092,55094,55107,55108,55129,55130,55131,55132,55133,55136,55198,55225,55226,55233,55236,55237,55339,55340,55610,55620,55623,55666,55667,56314,56315,56316,56317,56318,56333,56336,56337,56339,56340,56341,56342,56343,56344,56611,56612,56613,56614,56636,56637,56638,56822,56834,56835,56924,56927,56929,56930,56931,56932,57470,57472,57499,57810,57811,57812,57813,57814,57849,57850,57851,57865,57873,57876,57877,57878,57880,57881,58410,58413,58414,58415,58422,58423,58424,58425,58426,58435,58872,58874,59057,59088,59089,59672,59738,59739,59740,59741,60103,60184,60185,60187,60188,60970,61154,61155,61156,61157,61158,61216,61221,61222,61295,61329,61330,61331,61336,61345,61346,62097,62098,62099,62100,62101,62905,62908,63108,63117,63121,63123,63156,63158,63245,63349,63350,63351,63370,63372,63373,63374,63410,63411,63457,63458,63503,63504,63505,63506,63534,63542,63543,63560,63574,63625,63626,63627,63646,63647,63648,63649,63650,63730,63733,63737,64044,64127,64129,64205,64353,64357,64976,65139,65661,66191,66192,66799,66814,66815,66816,66817);
+
+-- XTElite1 - Talents that teach an initial skill, and you learn higher ranks from a trainer. Here's a cleanup query that will remove all those:
+DELETE FROM `character_spell` WHERE `spell` IN (12505,12522,12523,12524,12525,12526,13018,13019,13020,13021,13031,13032,13033,16979,17311,17312,17313,17314,17347,17348,18807,18809,18867,18868,18869,18870,18871,18937,18938,19238,19240,19241,19242,19243,20900,20901,20902,20903,20904,20909,20910,21551,21552,21553,24132,24133,24974,24975,24976,24977,25248,25387,25437,26864,27013,27065,27067,27068,27132,27133,27134,27263,27265,27870,27871,28275,30016,30022,30330,30404,30405,30413,30414,30546,32593,32594,33041,33042,33043,33405,33876,33878,33933,33938,33982,33983,33986,33987,34411,34412,34413,34863,34864,34865,34866,34916,34917,42890,42891,42944,42945,42949,42950,43038,43039,44780,44781,47485,47486,47497,47498,47826,47827,47841,47843,47846,47847,48086,48087,48088,48089,48155,48156,48159,48160,48172,48173,48468,48563,48564,48565,48566,48660,48663,48666,48998,48999,49011,49012,49049,49050,49283,49284,49376,53005,53006,53007,53199,53200,53201,53223,53225,53226,53227,53248,53249,53251,55359,55360,57720,57721,57722,59092,59156,59158,59159,59161,59163,59164,59170,59171,59172,60051,60052,60053,61299,61300,61301,61384);
+
+*/
diff --git a/sql/updates/5097_world_scripts.sql b/sql/updates/5097_world_scripts.sql
new file mode 100644
index 00000000000..6a4f6f8cd61
--- /dev/null
+++ b/sql/updates/5097_world_scripts.sql
@@ -0,0 +1,69 @@
+UPDATE creature_template SET ScriptName='npc_00x09hl' WHERE entry=7806;
+
+DELETE FROM script_waypoint WHERE entry=7806;
+INSERT INTO script_waypoint VALUES
+(7806, 0, 495.404358, -3478.350830, 114.837, 0, ''),
+(7806, 1, 492.704742, -3486.112549, 108.627, 0, ''),
+(7806, 2, 487.249756, -3485.764404, 107.890, 0, ''),
+(7806, 3, 476.851959, -3489.875977, 99.985, 0, ''),
+(7806, 4, 467.212402, -3493.355469, 99.819, 0, ''),
+(7806, 5, 460.017029, -3496.984375, 104.481, 0, ''),
+(7806, 6, 439.619446, -3500.730225, 110.534, 0, ''),
+(7806, 7, 428.326385, -3495.874756, 118.662, 0, ''),
+(7806, 8, 424.664032, -3489.381592, 121.999, 0, ''),
+(7806, 9, 424.137299, -3470.952637, 124.333, 0, ''),
+(7806, 10, 421.791107, -3449.242676, 119.126, 0, ''),
+(7806, 11, 404.247070, -3429.376953, 117.644, 0, ''),
+(7806, 12, 335.465271, -3430.717773, 116.456, 0, ''),
+(7806, 13, 317.160126, -3426.708984, 116.226, 0, ''),
+(7806, 14, 331.180115, -3464.002197, 117.143, 0, ''),
+(7806, 15, 336.393616, -3501.877441, 118.201, 0, ''),
+(7806, 16, 337.251312, -3544.764648, 117.284, 0, ''),
+(7806, 17, 337.748932, -3565.415527, 116.797, 0, ''),
+(7806, 18, 336.010925, -3597.363037, 118.225, 0, ''),
+(7806, 19, 324.619141, -3622.884033, 119.811, 0, ''),
+(7806, 20, 308.027466, -3648.600098, 123.047, 0, ''),
+(7806, 21, 276.325409, -3685.738525, 128.356, 0, ''),
+(7806, 22, 239.981064, -3717.330811, 131.874, 0, ''),
+(7806, 23, 224.950974, -3730.169678, 132.125, 0, ''),
+(7806, 24, 198.707870, -3768.292725, 129.420, 0, ''),
+(7806, 25, 183.758316, -3791.068848, 128.045, 0, ''),
+(7806, 26, 178.110657, -3801.575439, 128.370, 3000, 'SAY_OOX_DANGER'),
+(7806, 27, 162.215225, -3827.014160, 129.424, 0, ''),
+(7806, 28, 141.664734, -3864.519287, 131.419, 0, ''),
+(7806, 29, 135.301697, -3880.089111, 132.120, 0, ''),
+(7806, 30, 122.461151, -3910.071533, 135.605, 0, ''),
+(7806, 31, 103.376175, -3937.725098, 137.342, 0, ''),
+(7806, 32, 81.414474, -3958.614258, 138.469, 0, ''),
+(7806, 33, 55.378139, -3982.004639, 136.520, 0, ''),
+(7806, 34, 13.983131, -4013.952881, 126.903, 0, ''),
+(7806, 35, -21.658007, -4048.713623, 118.068, 0, ''),
+(7806, 36, -52.443058, -4081.209717, 117.477, 0, ''),
+(7806, 37, -102.710854, -4116.760742, 118.666, 0, ''),
+(7806, 38, -92.996193, -4135.847168, 119.310, 0, ''),
+(7806, 39, -86.391273, -4153.331055, 122.502, 0, ''),
+(7806, 40, -85.746086, -4163.600586, 121.892, 0, ''),
+(7806, 41, -90.544006, -4183.577637, 117.587, 0, ''),
+(7806, 42, -110.223564, -4205.861328, 121.878, 0, ''),
+(7806, 43, -115.257607, -4211.962402, 121.878, 3000, 'SAY_OOX_DANGER'),
+(7806, 44, -128.594650, -4233.343750, 117.766, 0, ''),
+(7806, 45, -135.358917, -4258.120117, 117.562, 0, ''),
+(7806, 46, -156.832428, -4258.961914, 120.059, 0, ''),
+(7806, 47, -167.119873, -4274.102539, 117.062, 0, ''),
+(7806, 48, -176.291016, -4287.594727, 118.721, 0, ''),
+(7806, 49, -196.992981, -4315.815430, 117.588, 0, ''),
+(7806, 50, -209.329300, -4331.671387, 115.142, 0, ''),
+(7806, 51, -232.292236, -4356.015625, 108.543, 0, ''),
+(7806, 52, -232.159683, -4370.904297, 102.815, 0, ''),
+(7806, 53, -210.271133, -4389.896973, 84.167, 0, ''),
+(7806, 54, -187.940186, -4407.532715, 70.987, 0, ''),
+(7806, 55, -181.353577, -4418.771973, 64.778, 0, ''),
+(7806, 56, -170.529861, -4440.438965, 58.943, 0, ''),
+(7806, 57, -141.428543, -4465.323242, 45.963, 0, ''),
+(7806, 58, -120.993629, -4487.088379, 32.075, 0, ''),
+(7806, 59, -104.134621, -4501.837402, 25.051, 0, ''),
+(7806, 60, -84.154663, -4529.436523, 11.952, 0, ''),
+(7806, 61, -88.698898, -4544.626465, 9.055, 0, ''),
+(7806, 62, -100.603447, -4575.034180, 11.388, 0, ''),
+(7806, 63, -106.908669, -4600.407715, 11.046, 0, ''),
+(7806, 64, -106.831703, -4620.503418, 11.057, 3000, 'SAY_OOX_COMPLETE');
diff --git a/sql/updates/5105_world_scripts.sql b/sql/updates/5105_world_scripts.sql
new file mode 100644
index 00000000000..33a32fcc254
--- /dev/null
+++ b/sql/updates/5105_world_scripts.sql
@@ -0,0 +1,311 @@
+DELETE FROM script_waypoint WHERE entry=3439;
+INSERT INTO script_waypoint VALUES
+(3439, 0, 1105.090332, -3101.254150, 82.706, 1000, 'SAY_STARTUP1'),
+(3439, 1, 1103.204468, -3104.345215, 83.113, 1000, ''),
+(3439, 2, 1107.815186, -3106.495361, 82.739, 1000, ''),
+(3439, 3, 1104.733276, -3100.830811, 82.747, 1000, ''),
+(3439, 4, 1103.242554, -3106.270020, 83.133, 1000, ''),
+(3439, 5, 1112.807373, -3106.285400, 82.320, 1000, ''),
+(3439, 6, 1112.826782, -3108.908691, 82.377, 1000, ''),
+(3439, 7, 1108.053955, -3115.156738, 82.894, 0, ''),
+(3439, 8, 1108.355591, -3104.365234, 82.377, 5000, ''),
+(3439, 9, 1100.306763, -3097.539063, 83.150, 0, 'SAY_STARTUP2'),
+(3439, 10, 1100.562378, -3082.721924, 82.768, 0, ''),
+(3439, 11, 1097.512939, -3069.226563, 82.206, 0, ''),
+(3439, 12, 1092.964966, -3053.114746, 82.351, 0, ''),
+(3439, 13, 1094.010986, -3036.958496, 82.888, 0, ''),
+(3439, 14, 1095.623901, -3025.760254, 83.392, 0, ''),
+(3439, 15, 1107.656494, -3013.530518, 85.653, 0, ''),
+(3439, 16, 1119.647705, -3006.928223, 87.019, 0, ''),
+(3439, 17, 1129.991211, -3002.410645, 91.232, 7000, 'SAY_MERCENARY'),
+(3439, 18, 1133.328735, -2997.710693, 91.675, 1000, 'SAY_PROGRESS_1'),
+(3439, 19, 1131.799316, -2987.948242, 91.976, 1000, ''),
+(3439, 20, 1122.028687, -2993.397461, 91.536, 0, ''),
+(3439, 21, 1116.614868, -2981.916748, 92.103, 0, ''),
+(3439, 22, 1102.239136, -2994.245117, 92.074, 0, ''),
+(3439, 23, 1096.366211, -2978.306885, 91.873, 0, ''),
+(3439, 24, 1091.971558, -2985.919189, 91.730, 40000, 'SAY_PROGRESS_2');
+
+DELETE FROM script_waypoint WHERE entry = 1978;
+INSERT INTO script_waypoint VALUES
+(1978, 0, 1406.32, 1083.10, 52.55, 0, ''),
+(1978, 1, 1400.49, 1080.42, 52.50, 0, 'first say'),
+(1978, 2, 1388.48, 1083.10, 52.52, 0, ''),
+(1978, 3, 1370.16, 1084.02, 52.30, 0, ''),
+(1978, 4, 1359.02, 1080.85, 52.46, 0, ''),
+(1978, 5, 1341.43, 1087.39, 52.69, 0, ''),
+(1978, 6, 1321.93, 1090.51, 50.66, 0, ''),
+(1978, 7, 1312.98, 1095.91, 47.49, 0, ''),
+(1978, 8, 1301.09, 1102.94, 47.76, 0, ''),
+(1978, 9, 1297.73, 1106.35, 50.18, 0, ''),
+(1978, 10, 1295.49, 1124.32, 50.49, 0, ''),
+(1978, 11, 1294.84, 1137.25, 51.75, 0, ''),
+(1978, 12, 1292.89, 1158.99, 52.65, 0, ''),
+(1978, 13, 1290.75, 1168.67, 52.56, 1000, 'complete quest and say last'),
+(1978, 14, 1287.12, 1203.49, 52.66, 5000, ''),
+(1978, 15, 1287.12, 1203.49, 52.66, 4000, ''),
+(1978, 16, 1287.12, 1203.49, 52.66, 5000, ''),
+(1978, 17, 1287.12, 1203.49, 52.66, 4000, ''),
+(1978, 18, 1290.72, 1207.44, 52.69, 0, ''),
+(1978, 19, 1297.50, 1207.18, 53.74, 0, ''),
+(1978, 20, 1301.32, 1220.90, 53.74, 0, ''),
+(1978, 21, 1298.55, 1220.43, 53.74, 0, ''),
+(1978, 22, 1297.59, 1211.23, 58.47, 0, ''),
+(1978, 23, 1305.01, 1206.10, 58.51, 0, ''),
+(1978, 24, 1310.51, 1207.36, 58.51, 5000, ''),
+(1978, 25, 1310.51, 1207.36, 58.51, 5000, ''),
+(1978, 26, 1310.51, 1207.36, 58.51, 2000, '');
+
+DELETE FROM script_waypoint WHERE entry = 7784;
+INSERT INTO script_waypoint VALUES
+(7784 ,0, -8843.73, -4374.44, 43.71, 0, ''),
+(7784 ,1, -8834.68, -4373.88, 45.71, 0, ''),
+(7784 ,2, -8832.93, -4373.85, 45.67, 0, ''),
+(7784 ,3, -8829.21, -4373.72, 44.14, 0, ''),
+(7784 ,4, -8825.10, -4373.56, 41.44, 0, ''),
+(7784 ,5, -8818.88, -4372.75, 36.43, 0, ''),
+(7784 ,6, -8803.37, -4369.68, 30.06, 0, ''),
+(7784 ,7, -8786.68, -4366.18, 23.91, 0, ''),
+(7784 ,8, -8764.97, -4366.94, 25.23, 0, ''),
+(7784 ,9, -8745.49, -4363.16, 22.80, 0, ''),
+(7784 ,10, -8724.13, -4353.55, 20.72, 0, ''),
+(7784 ,11, -8706.77, -4346.14, 16.12, 0, ''),
+(7784 ,12, -8688.27, -4372.85, 13.64, 0, ''),
+(7784 ,13, -8668.76, -4380.38, 11.69, 0, ''),
+(7784 ,14, -8645.19, -4388.62, 12.56, 0, ''),
+(7784 ,15, -8614.73, -4398.60, 9.86, 0, ''),
+(7784 ,16, -8560.33, -4411.27, 13.17, 0, ''),
+(7784 ,17, -8536.45, -4416.49, 11.84, 0, ''),
+(7784 ,18, -8503.48, -4423.70, 13.59, 0, ''),
+(7784 ,19, -8471.91, -4430.60, 9.56, 0, ''),
+(7784 ,20, -8441.36, -4435.31, 9.40, 0, ''),
+(7784 ,21, -8403.41, -4441.16, 11.83, 0, ''),
+(7784 ,22, -8371.24, -4446.13, 9.47, 0, ''),
+(7784 ,23, -8353.96, -4448.79, 10.10, 0, 'Scorpid'),
+(7784 ,24, -8336.40, -4446.39, 8.98, 0, ''),
+(7784 ,25, -8303.78, -4441.96, 11.89, 0, ''),
+(7784 ,26, -8272.20, -4433.31, 9.60, 0, ''),
+(7784 ,27, -8224.76, -4419.39, 13.03, 0, ''),
+(7784 ,28, -8193.31, -4406.04, 10.17, 0, ''),
+(7784 ,29, -8155.65, -4397.74, 8.99, 0, ''),
+(7784 ,30, -8129.25, -4394.57, 10.92, 0, ''),
+(7784 ,31, -8104.86, -4399.03, 8.93, 0, ''),
+(7784 ,32, -8063.15, -4423.40, 10.07, 0, ''),
+(7784 ,33, -8032.15, -4443.47, 9.97, 0, ''),
+(7784 ,34, -8015.39, -4454.33, 9.39, 0, ''),
+(7784 ,35, -7981.64, -4482.44, 10.32, 0, ''),
+(7784 ,36, -7958.83, -4503.98, 9.69, 0, ''),
+(7784 ,37, -7932.45, -4528.91, 10.08, 0, ''),
+(7784 ,38, -7904.09, -4566.67, 12.59, 0, ''),
+(7784 ,39, -7883.33, -4593.91, 12.15, 0, ''),
+(7784 ,40, -7862.83, -4624.53, 10.21, 0, ''),
+(7784 ,41, -7840.79, -4654.26, 9.45, 0, ''),
+(7784 ,42, -7826.17, -4673.99, 10.61, 0, ''),
+(7784 ,43, -7807.86, -4698.69, 11.24, 0, ''),
+(7784 ,44, -7793.88, -4717.55, 10.48, 0, ''),
+(7784 ,45, -7778.68, -4738.05, 8.89, 0, ''),
+(7784 ,46, -7746.42, -4780.39, 9.84, 0, ''),
+(7784 ,47, -7724.11, -4772.75, 10.28, 0, ''),
+(7784 ,48, -7697.98, -4763.80, 9.52, 0, ''),
+(7784 ,49, -7665.33, -4752.62, 10.56, 0, ''),
+(7784 ,50, -7641.47, -4750.33, 8.94, 0, ''),
+(7784 ,51, -7620.08, -4753.96, 8.93, 0, ''),
+(7784 ,52, -7603.15, -4757.53, 9.06, 0, ''),
+(7784 ,53, -7579.43, -4767.07, 8.93, 0, ''),
+(7784 ,54, -7558.51, -4779.01, 9.64, 0, ''),
+(7784 ,55, -7536.40, -4789.32, 8.92, 0, ''),
+(7784 ,56, -7512.07, -4793.50, 9.35, 0, 'Wastewander'),
+(7784 ,57, -7490.79, -4788.80, 10.53, 0, ''),
+(7784 ,58, -7469.10, -4785.11, 10.42, 0, ''),
+(7784 ,59, -7453.18, -4782.41, 9.15, 0, ''),
+(7784 ,60, -7426.27, -4777.83, 9.54, 0, ''),
+(7784 ,61, -7393.84, -4770.19, 12.57, 0, ''),
+(7784 ,62, -7367.25, -4764.17, 11.92, 0, ''),
+(7784 ,63, -7341.00, -4752.11, 10.17, 0, ''),
+(7784 ,64, -7321.62, -4744.97, 11.58, 0, ''),
+(7784 ,65, -7302.35, -4744.35, 11.97, 0, ''),
+(7784 ,66, -7281.00, -4743.66, 11.21, 0, ''),
+(7784 ,67, -7258.33, -4742.93, 9.64, 0, ''),
+(7784 ,68, -7236.70, -4742.24, 10.16, 0, ''),
+(7784 ,69, -7217.52, -4743.87, 10.79, 0, ''),
+(7784 ,70, -7201.86, -4746.32, 9.58, 0, ''),
+(7784 ,71, -7182.01, -4749.41, 9.09, 0, ''),
+(7784 ,72, -7159.61, -4752.90, 9.52, 0, ''),
+(7784 ,73, -7139.58, -4756.02, 9.53, 0, ''),
+(7784 ,74, -7122.60, -4754.91, 9.66, 0, ''),
+(7784 ,75, -7101.06, -4753.87, 8.92, 0, ''),
+(7784 ,76, -7082.79, -4752.99, 9.97, 0, ''),
+(7784 ,77, -7061.81, -4751.98, 9.26, 0, ''),
+(7784 ,78, -7035.12, -4754.39, 9.19, 0, ''),
+(7784 ,79, -7013.90, -4758.64, 10.28, 0, ''),
+(7784 ,80, -7001.71, -4769.73, 10.59, 0, ''),
+(7784 ,81, -6984.95, -4788.61, 9.30, 0, ''),
+(7784 ,82, -6970.41, -4788.77, 9.42, 0, ''),
+(7784 ,83, -6957.16, -4788.92, 6.26, 0, ''),
+(7784 ,84, -6951.29, -4802.73, 4.45, 0, ''),
+(7784 ,85, -6944.81, -4816.58, 1.60, 0, ''),
+(7784 ,86, -6942.06, -4839.40, 0.66, 5000, '');
+
+DELETE FROM script_waypoint WHERE entry = 4508;
+INSERT INTO script_waypoint VALUES
+(4508 ,0, 2194.38, 1791.65, 65.48, 5000, ''),
+(4508 ,1, 2188.56, 1805.87, 64.45, 0, ''),
+(4508 ,2, 2187, 1843.49, 59.33, 0, ''),
+(4508 ,3, 2163.27, 1851.67, 56.73, 5000, ''),
+(4508 ,4, 2137.66, 1843.98, 48.08, 5000, ''),
+(4508 ,5, 2140.22, 1845.02, 48.32, 0, ''),
+(4508 ,6, 2131.5, 1804.29, 46.85, 0, ''),
+(4508 ,7, 2096.18, 1789.03, 51.13, 0, ''),
+(4508 ,8, 2074.46, 1780.09, 55.64, 3000, ''),
+(4508 ,9, 2055.12, 1768.67, 58.46, 5000, ''),
+(4508 ,10, 2037.83, 1748.62, 60.27, 0, ''),
+(4508 ,11, 2037.51, 1728.94, 60.85, 0, ''),
+(4508 ,12, 2044.7, 1711.71, 59.71, 0, ''),
+(4508 ,13, 2067.66, 1701.84, 57.77, 3000, ''),
+(4508 ,14, 2078.91, 1704.54, 56.77, 3000, ''),
+(4508 ,15, 2097.65, 1715.24, 54.74, 0, ''),
+(4508 ,16, 2106.44, 1720.98, 54.41, 0, ''),
+(4508 ,17, 2123.96, 1732.56, 52.27, 0, ''),
+(4508 ,18, 2153.82, 1728.73, 51.92, 0, ''),
+(4508 ,19, 2163.49, 1706.33, 54.42, 0, ''),
+(4508 ,20, 2158.75, 1695.98, 55.70, 0, ''),
+(4508 ,21, 2142.6, 1680.72, 58.24, 0, ''),
+(4508 ,22, 2118.31, 1671.54, 59.21, 0, ''),
+(4508 ,23, 2086.02, 1672.04, 61.24, 0, ''),
+(4508 ,24, 2068.81, 1658.93, 61.24, 0, ''),
+(4508 ,25, 2062.82, 1633.31, 64.35, 3000, ''),
+(4508 ,26, 2063.05, 1589.16, 63.26, 0, ''),
+(4508 ,27, 2063.67, 1577.22, 65.89, 0, ''),
+(4508 ,28, 2057.94, 1560.68, 68.40, 0, ''),
+(4508 ,29, 2052.56, 1548.05, 73.35, 0, ''),
+(4508 ,30, 2045.22, 1543.4, 76.65, 0, ''),
+(4508 ,31, 2034.35, 1543.01, 79.70, 0, ''),
+(4508 ,32, 2029.95, 1542.94, 80.79, 0, ''),
+(4508 ,33, 2021.34, 1538.67, 80.8, 0, ''),
+(4508 ,34, 2012.45, 1549.48, 79.93, 0, ''),
+(4508 ,35, 2008.05, 1554.92, 80.44, 0, ''),
+(4508 ,36, 2006.54, 1562.72, 81.11, 0, ''),
+(4508 ,37, 2003.8, 1576.43, 81.57, 0, ''),
+(4508 ,38, 2000.57, 1590.06, 80.62, 0, ''),
+(4508 ,39, 1998.96, 1596.87, 80.22, 0, ''),
+(4508 ,40, 1991.19, 1600.82, 79.39, 0, ''),
+(4508 ,41, 1980.71, 1601.44, 79.77, 3000, ''),
+(4508 ,42, 1967.22, 1600.18, 80.62, 3000, ''),
+(4508 ,43, 1956.43, 1596.97, 81.75, 3000, ''),
+(4508 ,44, 1954.87, 1592.02, 82.18, 0, ''),
+(4508 ,45, 1948.35, 1571.35, 80.96, 30000, ''),
+(4508 ,46, 1947.02, 1566.42, 81.80, 30000, '');
+
+DELETE FROM script_waypoint WHERE entry = 9623;
+INSERT INTO script_waypoint VALUES
+(9623 ,1, -6380.38, -1965.14, -258.292, 5000, ''),
+(9623 ,2, -6383.06, -1962.9, -258.936, 0, ''),
+(9623 ,3, -6391.09, -1956.13, -260.291, 0, ''),
+(9623 ,4, -6395.29, -1933.58, -262.949, 0, ''),
+(9623 ,5, -6396.58, -1919.93, -263.838, 0, ''),
+(9623 ,6, -6389.01, -1912.64, -260.689, 0, ''),
+(9623 ,7, -6369.19, -1892.87, -255.924, 0, ''),
+(9623 ,8, -6373.77, -1879.36, -259.268, 0, ''),
+(9623 ,9, -6377.55, -1869.56, -260.503, 0, ''),
+(9623 ,10, -6376.58, -1860.79, -260.026, 0, ''),
+(9623 ,11, -6373.13, -1847.22, -259.249, 0, ''),
+(9623 ,12, -6370.54, -1837.04, -260.007, 0, ''),
+(9623 ,13, -6372.52, -1829.16, -260.071, 0, ''),
+(9623 ,14, -6377.13, -1815.94, -262.632, 0, ''),
+(9623 ,15, -6380.27, -1806.95, -265.53, 0, ''),
+(9623 ,16, -6386.04, -1790.43, -268.546, 0, ''),
+(9623 ,17, -6386.72, -1776.29, -269.851, 0, ''),
+(9623 ,18, -6385.92, -1762.31, -271.494, 0, ''),
+(9623 ,19, -6384.69, -1744.86, -272.196, 0, ''),
+(9623 ,20, -6383.8, -1732.66, -272.222, 0, ''),
+(9623 ,21, -6382.66, -1716.96, -272.235, 0, ''),
+(9623 ,22, -6381.5, -1703.01, -272.964, 0, ''),
+(9623 ,23, -6379.96, -1685.58, -272.842, 0, ''),
+(9623 ,24, -6379.34, -1678.61, -272.34, 0, ''),
+(9623 ,25, -6364.45, -1636.27, -271.065, 0, ''),
+(9623 ,26, -6371.85, -1626.36, -272.188, 0, ''),
+(9623 ,27, -6383.5, -1629.01, -272.206, 0, ''),
+(9623 ,28, -6388.09, -1635.37, -272.105, 5000, ''),
+(9623 ,29, -6375.42, -1637.33, -272.193, 0, ''),
+(9623 ,30, -6365.46, -1617.25, -272.141, 0, ''),
+(9623 ,31, -6353.79, -1603.48, -271.932, 0, ''),
+(9623 ,32, -6340.24, -1592.41, -269.435, 0, ''),
+(9623 ,33, -6329.45, -1566.89, -269.895, 0, ''),
+(9623 ,34, -6312.2, -1499.06, -269.507, 0, ''),
+(9623 ,35, -6304.55, -1468.5, -269.431, 0, ''),
+(9623 ,36, -6310.36, -1440.94, -268.427, 0, ''),
+(9623 ,37, -6321, -1418.91, -266.525, 0, ''),
+(9623 ,38, -6358.76, -1389.97, -267.522, 0, ''),
+(9623 ,39, -6378.65, -1375.67, -271.749, 0, ''),
+(9623 ,40, -6387.22, -1360.95, -272.109, 0, ''),
+(9623 ,41, -6406.95, -1323.87, -271.586, 0, ''),
+(9623 ,42, -6405, -1311.92, -271.906, 0, ''),
+(9623 ,43, -6395.56, -1303.62, -271.902, 0, ''),
+(9623 ,44, -6375.97, -1296.08, -271.865, 0, ''),
+(9623 ,45, -6364.39, -1281.23, -269.012, 0, ''),
+(9623 ,46, -6353.71, -1263.19, -267.95, 0, ''),
+(9623 ,47, -6340.09, -1248.65, -267.441, 0, ''),
+(9623 ,48, -6338.21, -1237.11, -267.844, 0, ''),
+(9623 ,49, -6336.6, -1219.69, -269.196, 0, ''),
+(9623 ,50, -6334.44, -1202.33, -271.527, 0, ''),
+(9623 ,51, -6329.56, -1189.82, -270.947, 0, ''),
+(9623 ,52, -6324.66, -1179.46, -270.103, 0, ''),
+(9623 ,53, -6315.08, -1176.74, -269.735, 0, ''),
+(9623 ,54, -6308.49, -1179.12, -269.57, 0, ''),
+(9623 ,55, -6302.43, -1181.32, -269.328, 5000, ''),
+(9623 ,56, -6298.87, -1185.79, -269.278, 0, '');
+
+DELETE FROM script_waypoint WHERE entry = 18760;
+INSERT INTO script_waypoint VALUES
+(18760 ,0, -2265.21, 3091.14, 13.91, 0, ''),
+(18760 ,1, -2266.80, 3091.33, 13.82, 1000, ''),
+(18760 ,2, -2268.20, 3091.14, 13.82, 7000, 'progress1'),
+(18760 ,3, -2278.32, 3098.98, 13.82, 0, ''),
+(18760 ,4, -2294.82, 3110.59, 13.82, 0, ''),
+(18760 ,5, -2300.71, 3114.60, 13.82, 20000, 'progress2'),
+(18760 ,6, -2300.71, 3114.60, 13.82, 3000, 'progress3'),
+(18760 ,7, -2307.36, 3122.76, 13.79, 0, ''),
+(18760 ,8, -2312.83, 3130.55, 12.04, 0, ''),
+(18760 ,9, -2345.02, 3151.00, 8.38, 0, ''),
+(18760 ,10, -2351.97, 3157.61, 6.27, 0, ''),
+(18760 ,11, -2360.35, 3171.48, 3.31, 0, ''),
+(18760 ,12, -2371.44, 3185.41, 0.89, 0, ''),
+(18760 ,13, -2371.21, 3197.92, -0.96, 0, ''),
+(18760 ,14, -2380.35, 3210.45, -1.08, 0, ''),
+(18760 ,15, -2384.74, 3221.25, -1.17, 0, ''),
+(18760 ,16, -2386.15, 3233.39, -1.29, 0, ''),
+(18760 ,17, -2383.45, 3247.79, -1.32, 0, ''),
+(18760 ,18, -2367.50, 3265.64, -1.33, 0, ''),
+(18760 ,19, -2354.90, 3273.30, -1.50, 0, ''),
+(18760 ,20, -2348.88, 3280.58, -0.09, 0, ''),
+(18760 ,21, -2349.06, 3295.86, -0.95, 0, ''),
+(18760 ,22, -2350.43, 3328.27, -2.10, 0, ''),
+(18760 ,23, -2346.76, 3356.27, -2.82, 0, ''),
+(18760 ,24, -2340.56, 3370.68, -4.02, 0, ''),
+(18760 ,25, -2318.84, 3384.60, -7.61, 0, ''),
+(18760 ,26, -2313.99, 3398.61, -10.40, 0, ''),
+(18760 ,27, -2320.85, 3414.49, -11.49, 0, ''),
+(18760 ,28, -2338.26, 3426.06, -11.46, 0, ''),
+(18760 ,29, -2342.67, 3439.44, -11.32, 12000, 'progress4'),
+(18760 ,30, -2342.67, 3439.44, -11.32, 7000, 'emote bye'),
+(18760 ,31, -2342.67, 3439.44, -11.32, 5000, 'cat form'),
+(18760 ,32, -2344.60, 3461.27, -10.44, 0, ''),
+(18760 ,33, -2396.81, 3517.17, -3.55, 0, ''),
+(18760 ,34, -2439.23, 3523.00, -1.05, 0, '');
+
+DELETE FROM script_waypoint WHERE entry = 20415;
+INSERT INTO script_waypoint VALUES
+(20415 ,0, 2488.77, 2184.89, 104.64, 0, ''),
+(20415 ,1, 2478.72, 2184.77, 98.58, 0, ''),
+(20415 ,2, 2473.52, 2184.71, 99.00, 0, ''),
+(20415 ,3, 2453.15, 2184.96, 97.09,4000, ''),
+(20415 ,4, 2424.18, 2184.15, 94.11, 0, ''),
+(20415 ,5, 2413.18, 2184.15, 93.42, 0, ''),
+(20415 ,6, 2402.02, 2183.90, 87.59, 0, ''),
+(20415 ,7, 2333.31, 2181.63, 90.03,4000, ''),
+(20415 ,8, 2308.73, 2184.34, 92.04, 0, ''),
+(20415 ,9, 2303.10, 2196.89, 94.94, 0, ''),
+(20415 ,10, 2304.58, 2272.23, 96.67, 0, ''),
+(20415 ,11, 2297.09, 2271.40, 95.16, 0, ''),
+(20415 ,12, 2297.68, 2266.79, 95.07,4000, ''),
+(20415 ,13, 2297.67, 2266.76, 95.07,4000, '');