cyaohiri's fork

merge of cyaohiri's fork

Core/AtlasLoot.lua

@@ -2638,7 +2638,11 @@ AtlasLoot_DewDropDown_SubTables = {
 		{ AL["Trash Mobs"], "SFKTrash" },
 	},
 	["TheStockade"] = {
+		{ AL["Targorr the Dread"], "SWStTargorr" },
 		{ AL["Kam Deepfury"], "SWStKamDeepfury" },
+		{ AL["Hamhock"], "SWStHamhock" },
+		{ AL["Dextren Ward"], "SWStDextren" },
+		{ AL["Bazil Thredd"], "SWStBazil" },
 		{ AL["Bruegal Ironknuckle"].." ("..AL["Rare"]..")", "SWStBruegalIronknuckle" },
 		{ AL["Trash Mobs"], "SWStTrash" },
 	},
@@ -2775,7 +2779,9 @@ AtlasLoot_DewDropDown_SubTables = {
 	},
 	["RagefireChasm"] = {
 		{ AL["Taragaman the Hungerer"], "RFCTaragaman" },
+		{ AL["Oggleflint"], "RFCOggleflint" },
 		{ AL["Jergosh the Invoker"], "RFCJergosh" },
+		{ AL["Bazzalan"], "RFCBazzalan" },
 	},
 	["RazorfenDowns"] = {
 		{ AL["Tuten'kash"], "RFDTutenkash" },
@@ -2892,6 +2898,14 @@ AtlasLoot_DewDropDown_SubTables = {
 		{ AL["Zandalar Tribe"], "Zandalar1" },
 		{ AL["Silvermoon Remnant"], "Helf" },
 		{ AL["Revantusk Trolls"], "Revantusk" },
+		{ AL["Ironforge"], "Ironforge" },
+		{ AL["Darnassus"], "Darnassus" },
+		{ AL["Stormwind"], "Stormwind" },
+		{ AL["Gnomeregan Exiles"], "GnomereganExiles" },
+		{ AL["Durotar Labor Union"], "DurotarLaborUnion" },
+		{ AL["Undercity"], "Undercity" },
+		{ AL["Orgrimmar"], "Orgrimmar" },
+		{ AL["Thunder Bluff"], "ThunderBluff" },
 	},
 	["BoEWorldEpics"] = {
 		{ AtlasLoot_TableNames["WorldEpics3"][1], "WorldEpics3" },

Core/ButtonRegistry.lua

@@ -106,6 +106,46 @@ AtlasLoot_ButtonRegistry = {
         Back_Page = "REPMENU";
         Back_Title = AL["Factions"];
     };
+    ["Ironforge"] = {
+        Title = AL["Ironforge"];
+        Back_Page = "REPMENU";
+        Back_Title = AL["Factions"];
+    };
+    ["Darnassus"] = {
+        Title = AL["Darnassus"];
+        Back_Page = "REPMENU";
+        Back_Title = AL["Factions"];
+    };
+    ["Stormwind"] = {
+        Title = AL["Stormwind"];
+        Back_Page = "REPMENU";
+        Back_Title = AL["Factions"];
+    };
+    ["GnomereganExiles"] = {
+        Title = AL["Gnomeregan Exiles"];
+        Back_Page = "REPMENU";
+        Back_Title = AL["Factions"];
+    };
+    ["DurotarLaborUnion"] = {
+        Title = AL["Durotar Labor Union"];
+        Back_Page = "REPMENU";
+        Back_Title = AL["Factions"];
+    };
+    ["Undercity"] = {
+        Title = AL["Undercity"];
+        Back_Page = "REPMENU";
+        Back_Title = AL["Factions"];
+    };
+    ["Orgrimmar"] = {
+        Title = AL["Orgrimmar"];
+        Back_Page = "REPMENU";
+        Back_Title = AL["Factions"];
+    };
+    ["ThunderBluff"] = {
+        Title = AL["Thunder Bluff"];
+        Back_Page = "REPMENU";
+        Back_Title = AL["Factions"];
+    };
     ["Helf"] = {
         Title = AL["Silvermoon Remnant"];
         Next_Page = "Helf2";

Core/Factions.lua

@@ -123,6 +123,54 @@ function AtlasLootRepMenu()
 	AtlasLootMenuItem_28_Icon:SetTexture("Interface\\Icons\\INV_Misc_Head_Troll_01");
 	AtlasLootMenuItem_28.lootpage="Revantusk";
 	AtlasLootMenuItem_28:Show();
+	--Ironforge
+	AtlasLootMenuItem_14_Name:SetText(AL["Ironforge"]);
+	AtlasLootMenuItem_14_Extra:SetText("|cff2773ff"..AL["Alliance"]);
+	AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\INV_Staff_13");
+	AtlasLootMenuItem_14.lootpage="Ironforge";
+	AtlasLootMenuItem_14:Show();
+    	--Darnassus
+	AtlasLootMenuItem_15_Name:SetText(AL["Darnassus"]);
+	AtlasLootMenuItem_15_Extra:SetText("|cff2773ff"..AL["Alliance"]);
+	AtlasLootMenuItem_15_Icon:SetTexture("Interface\\Icons\\INV_Staff_13");
+	AtlasLootMenuItem_15.lootpage="Darnassus";
+	AtlasLootMenuItem_15:Show();
+    	--Stormwind
+	-- AtlasLootMenuItem_16_Name:SetText(AL["Stormwind"]);
+	-- AtlasLootMenuItem_16_Extra:SetText("|cff2773ff"..AL["Alliance"]);
+	-- AtlasLootMenuItem_16_Icon:SetTexture("Interface\\Icons\\INV_Staff_13");
+	-- AtlasLootMenuItem_16.lootpage="Stormwind";
+	-- AtlasLootMenuItem_16:Show();
+    	--Gnomeregan Exiles
+	-- AtlasLootMenuItem_17_Name:SetText(AL["Gnomeregan Exiles"]);
+	-- AtlasLootMenuItem_17_Extra:SetText("|cff2773ff"..AL["Alliance"]);
+	-- AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\INV_Staff_13");
+	-- AtlasLootMenuItem_17.lootpage="GnomereganExiles";
+	-- AtlasLootMenuItem_17:Show();
+    	--Durotar Labor Union
+	-- AtlasLootMenuItem_18_Name:SetText(AL["Durotar Labor Union"]);
+	-- AtlasLootMenuItem_18_Extra:SetText("|cff2773ff"..AL["Horde"]);
+	-- AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Staff_13");
+	-- AtlasLootMenuItem_18.lootpage="DurotarLaborUnion";
+	-- AtlasLootMenuItem_18:Show();
+    	--Undercity
+	-- AtlasLootMenuItem_19_Name:SetText(AL["Undercity"]);
+	-- AtlasLootMenuItem_19_Extra:SetText("|cff2773ff"..AL["Horde"]);
+	-- AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\INV_Staff_13");
+	-- AtlasLootMenuItem_19.lootpage="Undercity";
+	-- AtlasLootMenuItem_19:Show();
+    	--Orgrimmar
+	-- AtlasLootMenuItem_20_Name:SetText(AL["Orgrimmar"]);
+	-- AtlasLootMenuItem_20_Extra:SetText("|cff2773ff"..AL["Horde"]);
+	-- AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\INV_Staff_13");
+	-- AtlasLootMenuItem_20.lootpage="Orgrimmar";
+	-- AtlasLootMenuItem_20:Show();
+    	--Thunder Bluff
+	-- AtlasLootMenuItem_21_Name:SetText(AL["Thunder Bluff"]);
+	-- AtlasLootMenuItem_21_Extra:SetText("|cff2773ff"..AL["Horde"]);
+	-- AtlasLootMenuItem_21_Icon:SetTexture("Interface\\Icons\\INV_Staff_13");
+	-- AtlasLootMenuItem_21.lootpage="ThunderBluff";
+	-- AtlasLootMenuItem_21:Show();
 
 	for i = 1, 30, 1 do
 		getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();

Factions/factions.lua

@@ -539,5 +539,90 @@ AtlasLoot_Data["AtlasLootRepItems"] = {
         { 80645, "", "=q2=", "" },
         { 80646, "", "=q2=", "" },
         --{ 80647, "", "=q2=", "" },
-    }
+    };
+    Ironforge = {
+        { 0, "INV_Staff_13", "=q2=Honored", "" },
+        { 81211, "", "=q2=", "" },
+        { 81212, "", "=q2=", "" },
+        { 81215, "", "=q2=", "" },
+        { 81213, "", "=q2=", "" },
+        { 0, "", "", "" },
+        { 0, "INV_Staff_13", "=q2=Exalted", "" },
+        { 80303, "", "=q2=", "" },
+        { 81233, "", "=q2=", "" },
+    };
+    Darnassus = {
+        { 0, "INV_Staff_13", "=q2=Honored", "" },
+        { 60746, "", "=q2=", "" },
+        { 60747, "", "=q2=", "" },
+        { 60748, "", "=q2=", "" },
+        { 60749, "", "=q2=", "" },
+        { 60750, "", "=q2=", "" },
+        { 60751, "", "=q2=", "" },
+        { 0, "", "", "" },
+        { 0, "INV_Staff_13", "=q2=Revered", "" },
+        { 60752, "", "=q2=", "" },
+        { 0, "", "", "" },
+        { 0, "INV_Staff_13", "=q2=Exalted", "" },
+        { 80305, "", "=q2=", "" },
+    };
+    Stormwind = {
+        { 0, "INV_Staff_13", "=q2=Exalted", "" },
+        { 81225, "", "=q2=", "" },
+        { 80320, "", "=q2=", "" },
+    };
+    GnomereganExiles = {
+        { 0, "INV_Staff_13", "=q2=Exalted", "" },
+        { 81192, "", "=q2=", "" },
+        { 81193, "", "=q2=", "" },
+        { 81194, "", "=q2=", "" },
+        { 81195, "", "=q2=", "" },
+        { 80306, "", "=q2=", "" },
+    };
+    DurotarLaborUnion = {
+        { 0, "INV_Staff_13", "=q2=Friendly", "" },
+        { 50068, "", "=q2=", "" },
+        { 0, "", "", "" },
+        { 0, "INV_Staff_13", "=q2=Revered", "" },
+        { 81196, "", "=q2=", "" },
+        { 0, "", "", "" },
+        { 0, "INV_Staff_13", "=q2=Exalted", "" },
+        { 81190, "", "=q2=", "" },
+        { 81191, "", "=q2=", "" },
+        { 81089, "", "=q2=", "" },
+    };
+    Undercity = {
+        { 0, "INV_Staff_13", "=q2=Exalted", "" },
+        { 81244, "", "=q2=", "" },
+        { 81245, "", "=q2=", "" },
+        { 81246, "", "=q2=", "" },
+        { 81247, "", "=q2=", "" },
+        { 80309, "", "=q2=", "" },
+    };
+    Orgrimmar = {
+        { 0, "INV_Staff_13", "=q2=Honored", "" },
+        { 81216, "", "=q2=", "" },
+        { 81217, "", "=q2=", "" },
+        { 0, "", "", "" },
+        { 0, "INV_Staff_13", "=q2=Exalted", "" },
+        { 81241, "", "=q2=", "" },
+        { 80307, "", "=q2=", "" },
+    };
+    ThunderBluff = {
+        { 0, "INV_Staff_13", "=q2=Revered", "" },
+        { 81199, "", "=q2=", "" },
+        { 81218, "", "=q2=", "" },
+        { 81219, "", "=q2=", "" },
+        { 81220, "", "=q2=", "" },
+        { 81221, "", "=q2=", "" },
+        { 81222, "", "=q2=", "" },
+        { 0, "", "", "" },
+        { 0, "INV_Staff_13", "=q2=Exalted", "" },
+        { 81167, "", "=q2=", "" },
+        { 81223, "", "=q2=", "" },
+        { 81089, "", "=q2=", "" },
+        { 81198, "", "=q2=", "" },
+        { 81237, "", "=q2=", "" },
+        { 80308, "", "=q2=", "" },
+    };
 };

Instances/instances.en.lua

@@ -2512,7 +2512,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 9461, "INV_Misc_Gear_01", "=q3=Charged Gear", "=ds=#s13# =q2=#e31#", "28.49%" },
 		{ 9458, "INV_Shield_10", "=q3=Thermaplugg's Central Core", "=ds=#w8#", "28.61%" },
 		{ 9459, "INV_Axe_03", "=q3=Thermaplugg's Left Arm", "=ds=#h2#, #w1#", "18.05%" },
-		{ 0,"","","" },
+		{ 60098,"","=q3=", "50%" },
 		{ 0,"","","" },
 		{ 0,"","","" },
 		{ 0,"","","" },
@@ -3036,6 +3036,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 0, "", "", "" },
 		{ 5192, "INV_Sword_24", "=q2=Thief's Blade", "=ds=#h1#, #w10#", "34.96%" },
 		{ 5196, "INV_Axe_22", "=q2=Smite's Reaver", "=ds=#h1#, #w1#", "33.95%" },
+		{ 81007, "", "=q2=", "20%" },
 	};
 	DMCookie = {
 		{ 5198, "INV_Staff_02", "=q3=Cookie's Stirring Rod", "=ds=#w12#", "30.90%" },
@@ -3052,6 +3053,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 81007, "", "=q1=", "", "0.02%" },
 		{ 80802, "", "=q1=", "", "1.5%" },
 		{ 80803, "", "=q1=", "", "1.5%" },
+		{ 1943, "", "=q1=", "", "4%" },
 	};
 	STBalconyMinibosses = {
 		{ 10783, "INV_Shoulder_18", "=q3=Atal'ai Spaulders", "=ds=#s3#, #a2# =q2=#e32#", "3.12%" },
@@ -3995,26 +3997,26 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 0, "", "", "" },	
 		{ 11446, "INV_Misc_Note_05", "=q1=A Crumpled Up Note", "=ds=#m2#" },
 	};
-	RFCOggleflint = {
-		{ 80700, "", "=q3=", ""},
-		{ 80701, "", "=q3=", ""},
-		{ 80702, "", "=q3=", ""},
-	};
-	RFCBazzalan = {
-		{ 80705, "", "=q3=", ""},
-		{ 80704, "", "=q3=", ""},
-		{ 80703, "", "=q3=", ""},
-	};
 	RFCTaragaman = {
 		{ 14149, "INV_Misc_Cape_18", "=q2=Subterranean Cape", "=ds=#s4#", "31.59%" },
 		{ 14148, "INV_Bracer_13", "=q2=Crystalline Cuffs", "=ds=#s8#, #a1#", "33.91%" },
 		{ 14145, "INV_Weapon_ShortBlade_12", "=q2=Cursed Felblade", "=ds=#h3#, #w10#", "15.98%" },
 	};
+	RFCOggleflint = {
+		{ 80700, "", "=q3=", ""},
+		{ 80701, "", "=q3=", ""},
+		{ 80702, "", "=q3=", ""},
+	};
 	RFCJergosh = {
 		{ 14150, "INV_Chest_Cloth_24", "=q2=Robe of Evocation", "=ds=#s5#, #a1#", "36.40%" },
 		{ 14147, "INV_Bracer_07", "=q2=Cavedweller Bracers", "=ds=#s8#, #a3#", "34.35%" },
 		{ 14151, "INV_Weapon_ShortBlade_25", "=q2=Chanting Blade", "=ds=#h1#, #w4#", "17.10%" },
 	};
+	RFCBazzalan = {
+		{ 80705, "", "=q3=", ""},
+		{ 80704, "", "=q3=", ""},
+		{ 80703, "", "=q3=", ""},
+	};
 	SFKDeathswornCaptain = {
 		{ 6642, "INV_Chest_Chain_05", "=q3=Phantom Armor", "=ds=#s5#, #a3#", "30.49%" },
 		{ 0, "", "", "" },

Locale/locale.en.lua

@@ -1442,4 +1442,12 @@ AL:RegisterTranslations("enUS", function() return {
 	["Leaded Vial"] = true,
 	["Silvermoon Remnant"] = true,
 	["Revantusk Trolls"] = true,
+	["Ironforge"] = true,
+	["Darnassus"] = true,
+	["Stormwind"] = true,
+	["Gnomeregan Exiles"] = true,
+	["Durotar Labor Union"] = true,
+	["Undercity"] = true,
+	["Orgrimmar"] = true,
+	["Thunder Bluff"] = true,
 	} end)

TableRegister/loottables.en.lua

@@ -307,11 +307,10 @@ AtlasLoot_TableNames = {
     ["SFKTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Shadowfang Keep"] .. ")", "AtlasLootItems" },
     --The Stockade
     ["SWStTargorr"] = { AL["Targorr the Dread"], "AtlasLootItems" },
-    ["SWStHamhock"] = { AL["Hamhock"], "AtlasLootItems" },
-    ["SWStBazil"] = { AL["Bazil Thredd"], "AtlasLootItems" },
-    ["SWStDextren"] = { AL["Dextren Ward"], "AtlasLootItems"},
-
     ["SWStKamDeepfury"] = { AL["Kam Deepfury"], "AtlasLootItems" },
+    ["SWStHamhock"] = { AL["Hamhock"], "AtlasLootItems" },
+    ["SWStDextren"] = { AL["Dextren Ward"], "AtlasLootItems"},    
+    ["SWStBazil"] = { AL["Bazil Thredd"], "AtlasLootItems" },
     ["SWStBruegalIronknuckle"] = { AL["Bruegal Ironknuckle"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
     ["SWStTrash"] = { AL["Trash Mobs"] .. " (" .. AL["The Stockade"] .. ")", "AtlasLootItems" },
     --Stratholme
@@ -710,6 +709,14 @@ AtlasLoot_TableNames = {
 
     ["Helf"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" },
     ["Revantusk"] = { AL["Revantusk Trolls"], "AtlasLootRepItems" },
+    ["Ironforge"] = { AL["Ironforge"], "AtlasLootRepItems" },
+    ["Darnassus"] = { AL["Darnassus"], "AtlasLootRepItems" },
+    ["Stormwind"] = { AL["Stormwind"], "AtlasLootRepItems" },
+    ["GnomereganExiles"] = { AL["Gnomeregan Exiles"], "AtlasLootRepItems" },
+    ["DurotarLaborUnion"] = { AL["Durotar Labor Union"], "AtlasLootRepItems" },
+    ["Undercity"] = { AL["Undercity"], "AtlasLootRepItems" },
+    ["Orgrimmar"] = { AL["Orgrimmar"], "AtlasLootRepItems" },
+    ["ThunderBluff"] = { AL["Thunder Bluff"], "AtlasLootRepItems" },
 
     --------------
     --- Trades ---
@@ -1153,9 +1160,10 @@ AtlasLoot_TableNamesBoss = {
         ["Onyxia"] = { AL["Onyxia"], "AtlasLootItems" },
     },
     ["Ragefire Chasm"] = {
-        ["RFCOggleflint"] = { AL["Oggleflint"], "AtlasLootItems" },
         ["RFCTaragaman"] = { AL["Taragaman the Hungerer"], "AtlasLootItems" },
+        ["RFCOggleflint"] = { AL["Oggleflint"], "AtlasLootItems" },
         ["RFCJergosh"] = { AL["Jergosh the Invoker"], "AtlasLootItems" },
+        ["RFCBazzalan"] = { AL["Bazzalan"], "AtlasLootItems" },
     },
     ["Razorfen Downs"] = {
         ["RFDTutenkash"] = { AL["Tuten'kash"], "AtlasLootItems" },
@@ -1635,6 +1643,14 @@ AtlasLoot_TableNamesBoss = {
 
         ["Helf"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" },
         ["Revantusk"] = { AL["Revantusk Trolls"], "AtlasLootRepItems" },
+        ["Ironforge"] = { AL["Ironforge"], "AtlasLootRepItems" },
+        ["Darnassus"] = { AL["Darnassus"], "AtlasLootRepItems" },
+        ["Stormwind"] = { AL["Stormwind"], "AtlasLootRepItems" },
+        ["GnomereganExiles"] = { AL["Gnomeregan Exiles"], "AtlasLootRepItems" },
+        ["DurotarLaborUnion"] = { AL["Durotar Labor Union"], "AtlasLootRepItems" },
+        ["Undercity"] = { AL["Undercity"], "AtlasLootRepItems" },
+        ["Orgrimmar"] = { AL["Orgrimmar"], "AtlasLootRepItems" },
+        ["ThunderBluff"] = { AL["Thunder Bluff"], "AtlasLootRepItems" },
     },
 
     --------------