Merge branch 'dev'

This commit is contained in:
Spit
2025-01-29 19:19:23 +03:00
21 changed files with 866 additions and 846 deletions
+81 -17
View File
@@ -526,14 +526,14 @@ AtlasLootBossButtons = {
"SFKWolfMasterNandos";
"SFKArchmageArugal";
"";
"";
"";--SFKPrelate
"SFKTrash";
};
SMArmory = {
"VanillaKeys";
"";
"SMHerod";
"";
"";--SMQuartermaster
"";
"SMATrash";
"SCARLET";
@@ -557,7 +557,7 @@ AtlasLootBossButtons = {
"SMIronspine";
"SMAzshir";
"SMFallenChampion";
"";
"";--SMDukeDreadmoore
"";
"SMGTrash";
"SCARLET";
@@ -567,7 +567,7 @@ AtlasLootBossButtons = {
"SMHoundmasterLoksey";
"SMDoan";
"SMDoansBox";
"";
"";--SMBrotherWystan
"";
"SMLTrash";
"SCARLET";
@@ -681,14 +681,14 @@ AtlasLootBossButtons = {
TheDeadmines = {
"";
"";
"";
"";--DMJaredVoss
"DMRhahkZor";
"DMMinerJohnson";
"DMSneed";
"DMSneedsShredder";
"DMGilnid";
--"DMDefiasGunpowder";
"";
"";--DMHarvester
"DMMrSmite";
"DMCookie";
"DMCaptainGreenskin";
@@ -855,10 +855,10 @@ AtlasLootBossButtons = {
"WCLadyAnacondra";
"WCKresh";
"WCDeviateFaerieDragon";
"";
"";--WCZandara
"WCLordPythas";
"WCSkum";
"";
"";--WCVangros
"WCLordSerpentis";
"WCVerdan";
"WCMutanus";
@@ -1395,39 +1395,39 @@ AtlasLoot_Data["AtlasLootItems"] = {
{ 19352, "INV_Sword_51", "=q4=Chromatically Tempered Sword", "=ds=#h1#, #w10#", "10%" },
};
BWLNefarian = { --https://database.turtle-wow.org/?npc=11583
{ 16923, "INV_Chest_Cloth_03", "=q4=Robes of Transcendence", "=ds=#s1#, #a1# =q9=#c5#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{ 16923, "INV_Chest_Cloth_03", "=q4=Robes of Transcendence", "=ds=#s5#, #a1# =q9=#c5#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{47208,"=ds=#s5#, #a1# =q7=#db24#"},
},
},
},
{ 16916, "INV_Chest_Cloth_03", "=q4=Netherwind Robes", "=ds=#s1#, #a1# =q10=#c3#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{ 16916, "INV_Chest_Cloth_03", "=q4=Netherwind Robes", "=ds=#s5#, #a1# =q10=#c3#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{47088,"=ds=#s5#, #a1# =q7=#db24#"},
},
},
},
{ 16931, "INV_Chest_Leather_01", "=q4=Nemesis Robes", "=ds=#s1#, #a1# =q11=#c8#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{ 16931, "INV_Chest_Leather_01", "=q4=Nemesis Robes", "=ds=#s5#, #a1# =q11=#c8#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{47286,"=ds=#s5#, #a1# =q7=#db24#"},
},
},
},
{ 16905, "INV_Chest_Cloth_07", "=q4=Bloodfang Chestpiece", "=ds=#s1#, #a2# =q12=#c6#", "11%" },
{ 16897, "INV_Chest_Chain_16", "=q4=Stormrage Chestguard", "=ds=#s1#, #a2# =q13=#c1#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{ 16905, "INV_Chest_Cloth_07", "=q4=Bloodfang Chestpiece", "=ds=#s5#, #a2# =q12=#c6#", "11%" },
{ 16897, "INV_Chest_Chain_16", "=q4=Stormrage Chestguard", "=ds=#s5#, #a2# =q13=#c1#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{47348,"=ds=#s5#, #a2# =q7=#db24#"},{47356,"=ds=#s5#, #a2# =q7=#db24#"},
},
},
},
{ 16942, "INV_Chest_Chain_03", "=q4=Dragonstalker's Breastplate", "=ds=#s1#, #a3# =q14=#c2#", "11%" },
{ 16950, "INV_Chest_Chain_11", "=q4=Breastplate of Ten Storms", "=ds=#s1#, #a3# =q15=#c7#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{ 16942, "INV_Chest_Chain_03", "=q4=Dragonstalker's Breastplate", "=ds=#s5#, #a3# =q14=#c2#", "11%" },
{ 16950, "INV_Chest_Chain_11", "=q4=Breastplate of Ten Storms", "=ds=#s5#, #a3# =q15=#c7#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{47138,"=ds=#s5#, #a3# =q7=#db24#"},{47146,"=ds=#s5#, #a3# =q7=#db24#"},
},
},
},
{ 16958, "INV_Chest_Plate03", "=q4=Judgement Breastplate", "=ds=#s1#, #a4# =q16=#c4#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{ 16958, "INV_Chest_Plate03", "=q4=Judgement Breastplate", "=ds=#s5#, #a4# =q16=#c4#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{47018,"=ds=#s5#, #a4# =q7=#db24#"},{47026,"=ds=#s5#, #a4# =q7=#db24#"},
},
},
},
{ 16966, "INV_Chest_Plate16", "=q4=Breastplate of Wrath", "=ds=#s1#, #a4# =q17=#c9#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{ 16966, "INV_Chest_Plate16", "=q4=Breastplate of Wrath", "=ds=#s5#, #a4# =q17=#c9#", "11%", "", "", "", "", "", "", "", "", "", "", {{
{47250,"=ds=#s5#, #a4# =q7=#db24#"},
},
},
@@ -3918,6 +3918,14 @@ AtlasLoot_Data["AtlasLootItems"] = {
{ 0, "", "", "" },
{ 80710, "INV_SHOULDER_18", "=q2=Turtle Scale Shoulderguards", "=ds=#s3#, #a3#", "33%" },
};
-- WCZandara = {
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- };
WCLordPythas = {
{ 6472, "INV_Wand_10", "=q3=Stinging Viper", "=ds=#h1#, #w6#", "33%" },
{ 6473, "INV_Shirt_16", "=q2=Armor of the Fang", "=ds=#s5#, #a2#", "33%" },
@@ -3930,6 +3938,14 @@ AtlasLoot_Data["AtlasLootItems"] = {
{ 0, "", "", "" },
{ 80712, "INV_PANTS_08", "=q3=Charged Leggings", "=ds=#s11#, #a1#", "33%" },
};
-- WCVangros = {
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- };
WCLordSerpentis = {
{ 6469, "INV_Weapon_Bow_10", "=q3=Venomstrike", "=ds=#w2#", "25%" },
{ 5970, "INV_Gauntlets_19", "=q2=Serpent Gloves", "=ds=#s9#, #a1#", "25%" },
@@ -4505,6 +4521,14 @@ AtlasLoot_Data["AtlasLootItems"] = {
{ 60572, "INV_Shoulder_23", "=q3=Incendosaur Skin Pauldrons", "=ds=#s3#, #a2#, From Elites Outside Dungeon", "0.1%" },
{ 60612, "INV_Helmet_47", "=q3=Mixologist Goggles", "=ds=#s1#, #a2#", "0.0025%" },
};
-- DMJaredVoss = {
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- };
DMRhahkZor = {
{ 872, "INV_ThrowingAxe_01", "=q2=Rockslicer", "=ds=#h2#, #w1#", "5%" },
{ 5187, "INV_Hammer_09", "=q1=Rhahk'Zor's Hammer", "=ds=#h2#, #w6#", "95%" },
@@ -4532,6 +4556,14 @@ AtlasLoot_Data["AtlasLootItems"] = {
DMDefiasGunpowder = {
{ 5397, "INV_Misc_Ammo_Gunpowder_01", "=q1=Defias Gunpowder", "=ds=#m8#", "100%" },
};
-- DMHarvester = {
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- };
DMMrSmite = {
{ 7230, "INV_Hammer_09", "=q3=Smite's Mighty Hammer", "=ds=#h2#, #w6#", "20%" },
{ 5192, "INV_Sword_24", "=q2=Thief's Blade", "=ds=#h1#, #w10#", "30%" },
@@ -5062,6 +5094,14 @@ AtlasLoot_Data["AtlasLootItems"] = {
{ 0, "INV_Box_01", "=q6=#cb1#", "" },
{ 7146, "INV_Misc_Key_01", "=q2=The Scarlet Key", "=ds=#e14#" },
};
-- SMBrotherWystan = {
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- };
SMHerod = {
{ 7719, "INV_Helmet_25", "=q3=Raging Berserker's Helm", "=ds=#s1#, #a3#", "25%" },
{ 7718, "INV_Shoulder_01", "=q3=Herod's Shoulder", "=ds=#s3#, #a3#", "25%" },
@@ -5070,6 +5110,14 @@ AtlasLoot_Data["AtlasLootItems"] = {
{ 0, "", "", "" },
{ 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "1%" },
};
-- SMQuartermaster = {
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- };
SMFairbanks = {
{ 19507, "INV_Shoulder_27", "=q2=Inquisitor's Shawl", "=ds=#s3#, #a1#", "33%" },
{ 19508, "INV_Bracer_11", "=q2=Branded Leather Bracers", "=ds=#s8#, #a2#", "33%" },
@@ -5101,6 +5149,14 @@ AtlasLoot_Data["AtlasLootItems"] = {
{ 0, "", "", "" },
{ 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "1%" },
};
-- SMDukeDreadmoore = {
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- };
SMIronspine = {
{ 7688, "INV_Chest_Plate15", "=q3=Ironspine's Ribcage", "=ds=#s5#, #a3#", "33%" },
{ 7687, "INV_Hammer_19", "=q3=Ironspine's Fist", "=ds=#h1#, #w6#", "33%" },
@@ -5684,6 +5740,14 @@ AtlasLoot_Data["AtlasLootItems"] = {
{ 6340, "INV_Misc_Pelt_Wolf_02", "=q2=Fenrus' Hide", "=ds=#s4#", "50%" },
{ 3230, "INV_Bracer_07", "=q2=Black Wolf Bracers", "=ds=#s8#, #a2#", "50%" },
};
-- SFKPrelate = {
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- { 0, "", "", "" },
-- };
SFKArugalsVoidwalker = {
{ 5943, "INV_Bracer_03", "=q2=Rift Bracers", "=ds=#s8#, #a3#", "3%" },
};