From 192005653a207531567439461b90fcbfdef3747f Mon Sep 17 00:00:00 2001
From: merstrax <merstrax@gmail.com>
Date: Mon, 1 Nov 2021 20:08:47 -0400
Subject: [PATCH] Moved AtlasDifficulty to own file Commented out Mythic+ for
 BC and WotLK we can re-add when ready

---
 AtlasLoot/Core/AtlasDifficulty.lua | 181 +++++++++++++++++++++++++++++
 AtlasLoot/Core/AtlasLoot.lua       | 144 -----------------------
 AtlasLoot/Core/AtlasLoot.xml       |   9 +-
 3 files changed, 188 insertions(+), 146 deletions(-)
 create mode 100644 AtlasLoot/Core/AtlasDifficulty.lua

diff --git a/AtlasLoot/Core/AtlasDifficulty.lua b/AtlasLoot/Core/AtlasDifficulty.lua
new file mode 100644
index 0000000..794b991
--- /dev/null
+++ b/AtlasLoot/Core/AtlasDifficulty.lua
@@ -0,0 +1,181 @@
+AtlasLoot_Difficulty = {
+    -- table of difficulties and there itemID references
+    ["ClassicDungeon"] = { 
+        [1] = {
+            {"Normal", "", [4] = "Submenu"}, 
+        }, 
+        [2] = {
+            {"Bloodforged", 1, [4] = "Submenu"}, 
+        }, 
+    };
+    
+    ["ClassicDungeonExt"] = { 
+        [1] = {
+            {"Normal", "", [4] = "Submenu"}, 
+        }, 
+        [2] = {
+            {"Heroic", 3, "=q4=", [4] = "Submenu"}, 
+        }, 
+        [3] = {
+            {"Mythic", 4, "=q4=", [4] = "Submenu"}, 
+        }, 
+        [4] = { 
+            ["Mythic+ 1-10"] = {
+                {"Mythic 1", 5, "=q4=", [4] = "Submenu" },  {"Mythic 2", 6, "=q4=", [4] = "Submenu" },  {"Mythic 3", 7, "=q4=", [4] = "Submenu" },  {"Mythic 4", 8, "=q4=", [4] = "Submenu" },  {"Mythic 5", 9, "=q4=", [4] = "Submenu" }, 
+                {"Mythic 6", 10, "=q4=", [4] = "Submenu" }, {"Mythic 7", 11, "=q4=", [4] = "Submenu" }, {"Mythic 8", 12, "=q4=", [4] = "Submenu" }, {"Mythic 9", 13, "=q4=", [4] = "Submenu" }, {"Mythic 10", 14, "=q4=", [4] = "Submenu" },
+            }, 
+        },
+        [5] = {
+            ["Mythic+ 11-20"] = {
+                {"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" }, 
+                {"Mythic 16", 20, "=q4=", [4] = "Submenu" }, {"Mythic 17", 21, "=q4=", [4] = "Submenu" }, {"Mythic 18", 22, "=q4=", [4] = "Submenu" }, {"Mythic 19", 23, "=q4=", [4] = "Submenu" }, {"Mythic 20", 24, "=q4=", [4] = "Submenu" },
+            },
+        }, 
+        [6] = {
+            {"Bloodforged", 1, [4] = "Submenu"},
+        }, 
+    };
+    
+    ["ClassicRaid"] = { 
+        [1] = {
+            {"Normal Flex", "", [4] = "Submenu"}, 
+            }, 
+        [2] = {
+            {"Heroic Flex", 3, [4] = "Submenu"}, 
+        }, 
+        [3] = {
+            {"Ascended", 4, [4] = "Submenu"}, 
+        },
+        [4] = {
+            {"Bloodforged", 1, [4] = "Submenu"},
+        }, 
+    };
+    
+    ["BCDungeon"] = { 
+        [1] = {
+            {"Normal/Heroic", "", [4] = "Submenu"}, 
+        }, 
+        [2] = {
+            {"Mythic", 4, "=q4=", [4] = "Submenu"}, 
+        },
+        [3] = {
+            {"Bloodforged", 1, [4] = "Submenu"},
+        }, 
+        --[[
+        [3] = { 
+            ["Mythic+ 1-10"] = {
+                {"Mythic 1", 5, "=q4=", [4] = "Submenu" },  {"Mythic 2", 6, "=q4=", [4] = "Submenu" },  {"Mythic 3", 7, "=q4=", [4] = "Submenu" },  {"Mythic 4", 8, "=q4=", [4] = "Submenu" },  {"Mythic 5", 9, "=q4=", [4] = "Submenu" }, 
+                {"Mythic 6", 10, "=q4=", [4] = "Submenu" }, {"Mythic 7", 11, "=q4=", [4] = "Submenu" }, {"Mythic 8", 12, "=q4=", [4] = "Submenu" }, {"Mythic 9", 13, "=q4=", [4] = "Submenu" }, {"Mythic 10", 14, "=q4=", [4] = "Submenu" },
+            }, 
+        },
+        [4] = {
+            ["Mythic+ 11-20"] = {
+                {"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" }, 
+                {"Mythic 16", 20, "=q4=", [4] = "Submenu" }, {"Mythic 17", 21, "=q4=", [4] = "Submenu" }, {"Mythic 18", 22, "=q4=", [4] = "Submenu" }, {"Mythic 19", 23, "=q4=", [4] = "Submenu" }, {"Mythic 20", 24, "=q4=", [4] = "Submenu" },
+            },
+        }, 
+        ]]
+     };
+    
+    ["BCRaid"] = { 
+        [1] = {
+            {"Normal Flex", "", [4] = "Submenu"}, 
+            }, 
+        [2] = {
+            {"Heroic Flex", 3, [4] = "Submenu"}, 
+        }, 
+        [3] = {
+            {"Ascended", 4, [4] = "Submenu"}, 
+        },
+        [4] = {
+            {"Bloodforged", 1, [4] = "Submenu"},
+        },
+     };
+    
+    ["WrathDungeon"] = { 
+        [1] = {
+            {"Normal/Heroic", "", [4] = "Submenu"}, 
+        }, 
+        [2] = {
+            {"Mythic", 4, "=q4=", [4] = "Submenu"}, 
+        },
+        [3] = {
+            {"Bloodforged", 1, [4] = "Submenu"},
+        }, 
+        --[[
+        [3] = { 
+            ["Mythic+ 1-10"] = {
+                {"Mythic 1", 5, "=q4=", [4] = "Submenu" },  {"Mythic 2", 6, "=q4=", [4] = "Submenu" },  {"Mythic 3", 7, "=q4=", [4] = "Submenu" },  {"Mythic 4", 8, "=q4=", [4] = "Submenu" },  {"Mythic 5", 9, "=q4=", [4] = "Submenu" }, 
+                {"Mythic 6", 10, "=q4=", [4] = "Submenu" }, {"Mythic 7", 11, "=q4=", [4] = "Submenu" }, {"Mythic 8", 12, "=q4=", [4] = "Submenu" }, {"Mythic 9", 13, "=q4=", [4] = "Submenu" }, {"Mythic 10", 14, "=q4=", [4] = "Submenu" },
+            }, 
+        },
+        [4] = {
+            ["Mythic+ 11-20"] = {
+                {"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" }, 
+                {"Mythic 16", 20, "=q4=", [4] = "Submenu" }, {"Mythic 17", 21, "=q4=", [4] = "Submenu" }, {"Mythic 18", 22, "=q4=", [4] = "Submenu" }, {"Mythic 19", 23, "=q4=", [4] = "Submenu" }, {"Mythic 20", 24, "=q4=", [4] = "Submenu" },
+            },
+        }, 
+        ]]
+     };
+    
+    ["WrathRaid"] = { 
+        [1] = {
+            {"Normal Flex", "", [4] = "Submenu"}, 
+            }, 
+        [2] = {
+            {"Heroic Flex", 3, [4] = "Submenu"}, 
+        }, 
+        [3] = {
+            {"Ascended", 4, [4] = "Submenu"}, 
+        },
+        [4] = {
+            {"Bloodforged", 1, [4] = "Submenu"},
+        },
+     };
+    
+    ["Crafting"] = { 
+        [1] = {
+            {"Crafting Patterns", "", [4] = "Submenu" },
+        },
+        [2] = { 
+            {"Item Normal", "=s=Normal", [4] = "Submenu" },
+        },
+        [3] = { 
+            {"Bloodforged", 1, [4] = "Submenu" },
+        }, 
+    };
+    
+    ["CraftingExt"] = { 
+        [1] = {
+            {"Crafting Pattern Uncommon", "", [4] = "Submenu" },
+        },
+        [2] = { 
+            {"Crafting Patterns Rare", "Rare", [4] = "Submenu" },
+        },
+        [3] = { 
+            {"Crafting Patterns Epic", "Epic", [4] = "Submenu" },
+        },
+        [4] = { 
+            {"Item Uncommon", "=s=", [4] = "Submenu" },
+        },
+        [5] = { 
+            {"Item Rare", "=s=Rare", [4] = "Submenu" },
+        },
+        [6] = { 
+            {"Item Epic", "=s=Epic", [4] = "Submenu" }
+        }, 
+    };
+    
+
+    --Enums for comparisons in code
+    Bloodforged = 1;
+    Normal = 2;
+    Heroic = 3;
+    Mythic = 4; --Use for Ascended as well
+
+    MythicPlus = {5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}; --Usage AtlasLoot_Difficulty.MythicPlus[1-20];
+
+    DUPLICATE = 17;
+    MIN_DIF = 18;
+    MAX_DIF = 19;
+}
\ No newline at end of file
diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua
index 8b48de6..90beb3c 100644
--- a/AtlasLoot/Core/AtlasLoot.lua
+++ b/AtlasLoot/Core/AtlasLoot.lua
@@ -488,150 +488,6 @@ function AtlasLoot_OnLoad()
 	end
 end
 
-AtlasLoot_Difficulty = {
-		-- table of difficulties and there itemID references
-		["ClassicDungeon"] = { 
-			[1] = {
-				{"Normal", "", [4] = "Submenu"}, 
-			}, 
-			[2] = {
-				{"Bloodforged", 1, [4] = "Submenu"}, 
-			}, 
-		};
-		
-		["ClassicDungeonExt"] = { 
-			[1] = {
-				{"Normal", "", [4] = "Submenu"}, 
-			}, 
-			[2] = {
-				{"Heroic", 3, "=q4=", [4] = "Submenu"}, 
-			}, 
-			[3] = {
-				{"Mythic", 4, "=q4=", [4] = "Submenu"}, 
-			}, 
-			[4] = { 
-				["Mythic+ 1-10"] = {
-					{"Mythic 1", 5, "=q4=", [4] = "Submenu" },  {"Mythic 2", 6, "=q4=", [4] = "Submenu" },  {"Mythic 3", 7, "=q4=", [4] = "Submenu" },  {"Mythic 4", 8, "=q4=", [4] = "Submenu" },  {"Mythic 5", 9, "=q4=", [4] = "Submenu" }, 
-					{"Mythic 6", 10, "=q4=", [4] = "Submenu" }, {"Mythic 7", 11, "=q4=", [4] = "Submenu" }, {"Mythic 8", 12, "=q4=", [4] = "Submenu" }, {"Mythic 9", 13, "=q4=", [4] = "Submenu" }, {"Mythic 10", 14, "=q4=", [4] = "Submenu" },
-				}, 
-			},
-			[5] = {
-				["Mythic+ 11-20"] = {
-					{"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" }, 
-					{"Mythic 16", 20, "=q4=", [4] = "Submenu" }, {"Mythic 17", 21, "=q4=", [4] = "Submenu" }, {"Mythic 18", 22, "=q4=", [4] = "Submenu" }, {"Mythic 19", 23, "=q4=", [4] = "Submenu" }, {"Mythic 20", 24, "=q4=", [4] = "Submenu" },
-				},
-			}, 
-			[6] = {
-				{"Bloodforged", 1, [4] = "Submenu"},
-			}, 
-		};
-		
-		["ClassicRaid"] = { 
-			[1] = {
-				{"Normal Flex", "", [4] = "Submenu"}, 
-				}, 
-			[2] = {
-				{"Heroic Flex", 3, [4] = "Submenu"}, 
-			}, 
-			[3] = {
-				{"Ascended", 4, [4] = "Submenu"}, 
-			},
-			[4] = {
-				{"Bloodforged", 1, [4] = "Submenu"},
-			}, 
-		};
-		
-		["BCDungeon"] = { 
-			[1] = {
-				{"Normal/Heroic", "", [4] = "Submenu"}, 
-			}, 
-			[2] = {
-				{"Mythic", 4, "=q4=", [4] = "Submenu"}, 
-			}, 
-			[3] = { 
-				["Mythic+ 1-10"] = {
-					{"Mythic 1", 5, "=q4=", [4] = "Submenu" },  {"Mythic 2", 6, "=q4=", [4] = "Submenu" },  {"Mythic 3", 7, "=q4=", [4] = "Submenu" },  {"Mythic 4", 8, "=q4=", [4] = "Submenu" },  {"Mythic 5", 9, "=q4=", [4] = "Submenu" }, 
-					{"Mythic 6", 10, "=q4=", [4] = "Submenu" }, {"Mythic 7", 11, "=q4=", [4] = "Submenu" }, {"Mythic 8", 12, "=q4=", [4] = "Submenu" }, {"Mythic 9", 13, "=q4=", [4] = "Submenu" }, {"Mythic 10", 14, "=q4=", [4] = "Submenu" },
-				}, 
-			},
-			[4] = {
-				["Mythic+ 11-20"] = {
-					{"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" }, 
-					{"Mythic 16", 20, "=q4=", [4] = "Submenu" }, {"Mythic 17", 21, "=q4=", [4] = "Submenu" }, {"Mythic 18", 22, "=q4=", [4] = "Submenu" }, {"Mythic 19", 23, "=q4=", [4] = "Submenu" }, {"Mythic 20", 24, "=q4=", [4] = "Submenu" },
-				},
-			}, 
-			[5] = {
-				{"Bloodforged", 1, [4] = "Submenu"},
-			},
-		 };
-		
-		["BCRaid"] = { 
-			[1] = {
-				{"Normal Flex", "", [4] = "Submenu"}, 
-				}, 
-			[2] = {
-				{"Heroic Flex", 3, [4] = "Submenu"}, 
-			}, 
-			[3] = {
-				{"Ascended", 4, [4] = "Submenu"}, 
-			},
-			[4] = {
-				{"Bloodforged", 1, [4] = "Submenu"},
-			},
-		 };
-		
-		["WrathDungeon"] = { {"Normal/Heroic", "" }, {"Mythic", 4 }, {"Mythic1", 5 }, {"Mythic2", 6 }, {"Mythic3", 7 }, {"Mythic4", 8 }, {"Mythic5", 9 }, {"Mythic6", 10 },
-		{"Mythic7", 11 }, {"Mythic8", 12 }, {"Mythic9", 13 }, {"Mythic10", 14 }, {"Bloodforged", 1 }, };
-		
-		["WrathRaid"] = { {"Normal Flex", "" }, {"Heroic Flex", 3 }, {"Ascended", 4 }, {"Bloodforged", 1 }, };
-		
-		["Crafting"] = { 
-			[1] = {
-				{"Crafting Patterns", "", [4] = "Submenu" },
-			},
-			[2] = { 
-				{"Item Normal", "=s=Normal", [4] = "Submenu" },
-			},
-			[3] = { 
-				{"Bloodforged", 1, [4] = "Submenu" },
-			}, 
-		};
-		
-		["CraftingExt"] = { 
-			[1] = {
-				{"Crafting Pattern Uncommon", "", [4] = "Submenu" },
-			},
-			[2] = { 
-				{"Crafting Patterns Rare", "Rare", [4] = "Submenu" },
-			},
-			[3] = { 
-				{"Crafting Patterns Epic", "Epic", [4] = "Submenu" },
-			},
-			[4] = { 
-				{"Item Uncommon", "=s=", [4] = "Submenu" },
-			},
-			[5] = { 
-				{"Item Rare", "=s=Rare", [4] = "Submenu" },
-			},
-			[6] = { 
-				{"Item Epic", "=s=Epic", [4] = "Submenu" }
-			}, 
-		};
-		
-
-		--Enums for comparisons in code
-		Bloodforged = 1;
-		Normal = 2;
-		Heroic = 3;
-		Mythic = 4; --Use for Ascended as well
-
-		MythicPlus = {5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}; --Usage AtlasLoot_Difficulty.MythicPlus[1-20];
-
-		DUPLICATE = 17;
-		MIN_DIF = 18;
-		MAX_DIF = 19;
-}
-
 --[[
 AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame):
 dataID - Name of the loot table
diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml
index 57b0c4b..7183b76 100644
--- a/AtlasLoot/Core/AtlasLoot.xml
+++ b/AtlasLoot/Core/AtlasLoot.xml
@@ -1,5 +1,11 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/"   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   xsi:schemaLocation="http://www.blizzard.com/wow/ui/">
 
+	<!--Ascension Files-->
+	<Script file="AtlasDifficulty.lua"/>
+	<Script file="ItemIDsDatabase.lua"/>
+	<Script file="ItemIDsDatabase2.lua"/>
+
+	<!--Default Files-->
 	<Script file="Filter.lua"/>
     <Script file="ExtraText.lua"/>
     <Script file="TextParsing.lua"/>
@@ -11,8 +17,7 @@
 	<Script file="AtlasLoot.lua"/>
 	<Script file="WishList.lua"/>
     <Script file="Search.lua"/>
-	<Script file="ItemIDsDatabase.lua"/>\
-	<Script file="ItemIDsDatabase2.lua"/>
+	
     
 	
     <GameTooltip name="AtlasLootTooltip" inherits="GameTooltipTemplate" parent="UIParent" hidden="true"/>