Support 11.0.0.54935

Ghostopheles · May 29, 2024 · cc159e9 · cc159e9
1 parent 454852e
commit cc159e9
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 66 deletions.
diff --git a/Datamine/Modules/Unified/Templates/MapViewer/MapController.lua b/Datamine/Modules/Unified/Templates/MapViewer/MapController.lua
@@ -71,7 +71,6 @@ DatamineMapCanvasMixin = {};
 
 function DatamineMapCanvasMixin:OnLoad()
     self.TilePool = CreateTexturePool(self, "ARTWORK", -1, TILE_TEMPLATE_NAME, DatamineMapTileMixin.Reset);
-    self.TilePool:SetResetDisallowedIfNew(true);
 
     self.DisplayedWDT = 0;
     self.MapInfo = nil;

diff --git a/Datamine/Settings/SettingsCore.lua b/Datamine/Settings/SettingsCore.lua
@@ -2,6 +2,8 @@ local L = Datamine.Strings;
 local Events = Datamine.Events;
 local Registry = Datamine.EventRegistry;
 
+local CreateCheckbox = Settings.CreateCheckbox or Settings.CreateCheckBox;
+
 Datamine.Settings = {};
 
 Datamine.Setting = {
@@ -82,7 +84,7 @@ do
     local tooltip = L.CONFIG_DEBUGTARGETINFO_TOOLTIP;
 
     local setting = CreateCVarSetting(category, name, variable, variableType, defaultConfig[variable]);
-    Settings.CreateCheckBox(category, setting, tooltip);
+    CreateCheckbox(category, setting, tooltip);
     Settings.SetOnValueChangedCallback(variable, OnSettingChanged);
 
     allSettings[variable] = setting;
@@ -95,7 +97,7 @@ do
     local tooltip = L.CONFIG_CREATUREDATA_TOOLTIP;
 
     local setting = Settings.RegisterAddOnSetting(category, name, variable, variableType, defaultConfig[variable]);
-    Settings.CreateCheckBox(category, setting, tooltip);
+    CreateCheckbox(category, setting, tooltip);
     Settings.SetOnValueChangedCallback(variable, OnSettingChanged);
 
     allSettings[variable] = setting;
@@ -108,7 +110,7 @@ do
     local tooltip = L.CONFIG_AUTO_LOAD_MAP_DATA_TOOLTIP;
 
     local setting = Settings.RegisterAddOnSetting(category, name, variable, variableType, defaultConfig[variable]);
-    Settings.CreateCheckBox(category, setting, tooltip);
+    CreateCheckbox(category, setting, tooltip);
     Settings.SetOnValueChangedCallback(variable, OnSettingChanged);
 
     allSettings[variable] = setting;

diff --git a/Datamine_Maps/Generated/Map_DeephaulRavine.lua b/Datamine_Maps/Generated/Map_DeephaulRavine.lua
@@ -1460,6 +1460,11 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
+			5260303,
+			5260098,
+			5260102,
+			5260100,
+			5260104,
 			0,
 			0,
 			0,
@@ -1519,12 +1524,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
+			5260305,
 			5260108,
 			5260106,
 			5260110,
@@ -1588,7 +1588,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
+			5260325,
 			5260250,
 			5260248,
 			5260246,
@@ -1652,7 +1652,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
+			5260327,
 			5248609,
 			5248574,
 			5248572,
@@ -1716,7 +1716,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
+			5260323,
 			5248611,
 			5247712,
 			5247710,
@@ -5558,6 +5558,11 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
+			5260295,
+			5260066,
+			5260068,
+			5260070,
+			5260072,
 			0,
 			0,
 			0,
@@ -5617,12 +5622,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
+			5260297,
 			5260074,
 			5260076,
 			5260078,
@@ -5686,7 +5686,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
+			5260319,
 			5260242,
 			5260240,
 			5260238,
@@ -5750,7 +5750,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
+			5260317,
 			5248603,
 			5248568,
 			5248570,
@@ -5814,7 +5814,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
+			5260315,
 			5248607,
 			5247702,
 			5247706,
@@ -9656,6 +9656,11 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
+			5260287,
+			5260032,
+			5260036,
+			5260038,
+			5260040,
 			0,
 			0,
 			0,
@@ -9715,12 +9720,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
+			5260289,
 			5260046,
 			5260044,
 			5260042,
@@ -9784,7 +9784,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
+			5260307,
 			5260234,
 			5260232,
 			5260230,
@@ -9848,7 +9848,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
+			5260309,
 			5248601,
 			5248566,
 			5248564,
@@ -9912,7 +9912,7 @@ Datamine_Maps[5246270] = {
 			0,
 			0,
 			0,
-			0,
+			5260311,
 			5248597,
 			5247698,
 			5247694,

diff --git a/Datamine_Maps/Generated/Map_TheMaelstrom.lua b/Datamine_Maps/Generated/Map_TheMaelstrom.lua
@@ -1,18 +1,18 @@
 -- This file was generated by generate_maps.py
--- WDTFileDataID: 1319015
+-- WDTFileDataID: 1326466
 -- Map Name: TheMaelstrom
 
 local _, Datamine_Maps = ...;
 
-Datamine_Maps[1319015] = {
+Datamine_Maps[1326466] = {
     MapName = "The Maelstrom",
-    MapID = 1572,
-    Directory = [[MaelstromShamanHubIntroScenario]],
+    MapID = 1580,
+    Directory = [[MaelstromTitanScenario]],
     MapDescription0 = [[]],
     MapDescription1 = [[]],
     MapType = 1,
     InstanceType = 5,
-    ExpansionID = 3,
+    ExpansionID = 6,
     ParentMapID = -1,
     CosmeticParentMapID = -1,
     Grids = {
@@ -9969,6 +9969,11 @@ Datamine_Maps[1319015] = {
 			0,
 			0,
 			0,
+			1327002,
+			1327003,
+			1327004,
+			1327005,
+			1327006,
 			0,
 			0,
 			0,
@@ -10028,16 +10033,16 @@ Datamine_Maps[1319015] = {
 			0,
 			0,
 			0,
+			1326780,
+			1326781,
+			1326782,
+			1326783,
+			1326796,
 			0,
 			0,
 			0,
 			0,
 			0,
-			1318838,
-			1318839,
-			1318840,
-			1318841,
-			1318842,
 			0,
 			0,
 			0,
@@ -10092,16 +10097,16 @@ Datamine_Maps[1319015] = {
 			0,
 			0,
 			0,
+			1326784,
+			1326785,
+			1326786,
+			1326787,
+			1326797,
 			0,
 			0,
 			0,
 			0,
 			0,
-			1318843,
-			1318844,
-			1318845,
-			1318846,
-			1318847,
 			0,
 			0,
 			0,
@@ -10156,16 +10161,16 @@ Datamine_Maps[1319015] = {
 			0,
 			0,
 			0,
+			1326788,
+			1326789,
+			1326790,
+			1326791,
+			1326798,
 			0,
 			0,
 			0,
 			0,
 			0,
-			1318848,
-			1318849,
-			1318850,
-			1318851,
-			1318852,
 			0,
 			0,
 			0,
@@ -10220,16 +10225,16 @@ Datamine_Maps[1319015] = {
 			0,
 			0,
 			0,
+			1326792,
+			1326793,
+			1326794,
+			1326795,
+			1326799,
 			0,
 			0,
 			0,
 			0,
 			0,
-			1318853,
-			1318854,
-			1318855,
-			1318856,
-			1318857,
 			0,
 			0,
 			0,
@@ -10284,16 +10289,11 @@ Datamine_Maps[1319015] = {
 			0,
 			0,
 			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1318858,
-			1318859,
-			1318860,
-			1318861,
-			1318862,
+			1326800,
+			1326801,
+			1326802,
+			1326803,
+			1326804,
 			0,
 			0,
 			0,