Merge pull request #369 from artscout/master

Darkmoon Faire island fix
IrcDirk · Jun 17, 2024 · 7ddf62c · 7ddf62c
2 parents 92137e6 + cfbcf08
commit 7ddf62c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/Carbonite/Data/Zones.lua b/Carbonite/Data/Zones.lua
@@ -137,17 +137,17 @@ Nx.Zones = {
     [170] = L["Hrothgar's Landing"] .. "|77|80|2|4||",
     [171] = L["Trial of the Champion"] .. "|80|80|3|5|118|74.2|20.4|5",
     [172] = L["Trial of the Crusader"] .. "|80|80|3|5|118|75.1|21.8|1025",
-	[174] = L["The Lost Isles"] .. "|1|20|1|5||",
-	[179] = L["Gilneas"] .. "|1|20|0|2||",
+    [174] = L["The Lost Isles"] .. "|1|20|1|5||",
+    [179] = L["Gilneas"] .. "|1|20|0|2||",
     [183] = L["The Forge of Souls"] .. "|80|80|3|5|118|54.5|90.2|5",
     [184] = L["Pit of Saron"] .. "|80|80|3|5|118|54.5|91.3|5",
     [185] = L["Halls of Reflection"] .. "|80|80|3|5|118|54.8|90.8|5",
     [186] = L["Icecrown Citadel"] .. "|80|80|3|5|118|53.3|85.6|1025",
-	[194] = L["Kezan"] .. "|1|20|1|5||",
-	[198] = L["Mount Hyjal"] .. "|80|90|2|1||",
-	[199] = L["Southern Barrens"] .. "|20|60|2|1||",
+    [194] = L["Kezan"] .. "|1|20|1|5||",
+    [198] = L["Mount Hyjal"] .. "|80|90|2|1||",
+    [199] = L["Southern Barrens"] .. "|20|60|2|1||",
     [200] = L["The Ruby Sanctum"] .. "|80|80|3|5|115|0|0|1025",
-	[201] = L["Kelp'thar Forest"] .. "|80|90|2|2||",
+    [201] = L["Kelp'thar Forest"] .. "|80|90|2|2||",
     [202] = L["Gilneas City"] .. "|1|20|0|2||",
     [203] = L["Vashj'ir"] .. "|80|90|2|2||",
     [204] = L["Abyssal Depths"] .. "|80|90|2|2||",
@@ -156,7 +156,7 @@ Nx.Zones = {
     [207] = L["Deepholm"] .. "|80|90|2|5||",
     [210] = L["The Cape of Stranglethorn"] .. "|20|60|2|2||",
     [213] = L["Ragefire Chasm"] .. "|20|60|3|5|1454|51.9|58.4|5",
-	[217] = L["Ruins of Gilneas"] .. "|20|60|2|2||",
+    [217] = L["Ruins of Gilneas"] .. "|20|60|2|2||",
     [218] = L["Ruins of Gilneas City"] .. "|0|0|2|2||",
     [219] = L["Zul'Farrak"] .. "|20|60|3|5|1446|39.2|21.4|5",
     [220] = L["The Temple of Atal'Hakkar"] .. "|20|60|3|5|1435|69.83|54.14|5",
@@ -168,14 +168,14 @@ Nx.Zones = {
     [232] = L["Molten Core"] .. "|60|80|3|5|1428|20.70|33.33|40",
     [233] = L["Zul'Gurub"] .. "|55|70|3|5|1434|67.2|32.8|5",
     [234] = L["Dire Maul"] .. "|20|60|3|5|1444|59.1|45.4|5",
-	[241] = L["Twilight Highlands"] .. "|80|90|2|2||",
+    [241] = L["Twilight Highlands"] .. "|80|90|2|2||",
     [242] = L["Blackrock Depths"] .. "|20|60|3|5|1428|15.70|28.33|5",
-	[244] = L["Tol Barad"] .. "|80|90|2|2||",
+    [244] = L["Tol Barad"] .. "|80|90|2|2||",
     [245] = L["Tol Barad Peninsula"] .. "|0|0|2|2||",
     [246] = L["The Shattered Halls"] .. "|60|80|3|5|1944|48.02|51.88|5",
     [247] = L["Ruins of Ahn'Qiraj"] .. "|60|70|3|5|1451|29|93.8|20",
     [248] = L["Onyxia's Lair"] .. "|70|80|3|5|1445|52.41|76.39|1025",
-	[249] = L["Uldum"] .. "|80|90|2|1||",
+    [249] = L["Uldum"] .. "|80|90|2|1||",
     [250] = L["Blackrock Spire"] .. "|20|60|3|5|1428|15.70|33.33|10",
     [256] = L["Auchenai Crypts"] .. "|60|70|3|5|1952|37.3|65.61|5",
     [258] = L["Sethekk Halls"] .. "|60|70|3|5|1952|41.98|65.62|5",
@@ -190,17 +190,17 @@ Nx.Zones = {
     [272] = L["Mana-Tombs"] .. "|60|70|3|5|1952|39.63|62.06|5",
     [273] = L["The Black Morass"] .. "|60|70|3|5|1446|65.34|50|5",
     [274] = L["Old Hillsbrad Foothills"] .. "|60|70|3|5|1446|65.34|50|5",
-	[275] = L["The Battle for Gilneas"] .. "|0|0|3|4||",
+    [275] = L["The Battle for Gilneas"] .. "|0|0|3|4||",
     [276] = L["The Maelstrom"] .. "|20|60|2|5||",
     [277] = L["Lost City of the Tol'vir"] .. "|80|90|3|5|249|60.5|64.1|5",
     [279] = L["Wailing Caverns"] .. "|20|60|3|5|1413|46|36|5",
     [280] = L["Maraudon"] .. "|20|60|3|5|1443|29.48|62.53|5",
-	[282] = L["Baradin Hold"] .. "|80|90|3|5|244|51|50|1025",
+    [282] = L["Baradin Hold"] .. "|80|90|3|5|244|51|50|1025",
     [283] = L["Blackrock Caverns"] .. "|80|90|3|5|36|25.70|33.33|5",
     [285] = L["Blackwing Descent"] .. "|80|90|3|5|36|20.70|28.33|1025",
     [287] = L["Blackwing Lair"] .. "|60|70|3|5|1428|20.70|35.33|40",
     [291] = L["The Deadmines"] .. "|20|60|3|5|1436|42.56|71.72|5",
-	[293] = L["Grim Batol"] .. "|80|90|3|5|241|19.2|54.1|5",
+    [293] = L["Grim Batol"] .. "|80|90|3|5|241|19.2|54.1|5",
     [294] = L["The Bastion of Twilight"] .. "|80|90|3|5|241|33.9|78|1025",
     [297] = L["Halls of Origination"] .. "|80|90|3|5|249|71.8|52.2|5",
     [300] = L["Razorfen Downs"] .. "|33|47|3|5|1413|45.43|89.48|5",
@@ -223,12 +223,14 @@ Nx.Zones = {
     [334] = L["The Eye"] .. "|60|70|3|5|1953|73.62|63.73|25",
     [335] = L["Sunwell Plateau"] .. "|60|70|3|5|1957|44.27|45.65|25",
     [337] = L["Zul'Gurub"] .. "|55|60|3|5|1434|67.2|32.8|5",
-	[338] = L["Molten Front"] .. "|80|90|2|5||",
+    [338] = L["Molten Front"] .. "|80|90|2|5||",
     [339] = L["Black Temple"] .. "|60|70|3|5|1948|71.03|46.33|25",
     [347] = L["Hellfire Ramparts"] .. "|60|70|3|5|1944|47.64|53.57|5",
     [348] = L["Magisters' Terrace"] .. "|60|70|3|5|1957|61.18|30.83|5",
     [350] = L["Karazhan"] .. "|60|70|3|5|1430|47|74.94|10",
-	[367] = L["Firelands"] .. "|80|90|3|5|198|46.2|78.8|1025",
+    [367] = L["Firelands"] .. "|80|90|3|5|198|46.2|78.8|1025",
+    [407] = L["Darkmoon Island"] .. "|0|0|2|5||",
+    [409] = L["Dragon Soul"] .. "|85|85|3|5|1446|65.34|50|1025",
 }
 
 

diff --git a/Carbonite/NxMapData.lua b/Carbonite/NxMapData.lua
@@ -2325,11 +2325,12 @@ Map.ZoneOverlays = {
 		["crimsonexpanse"] = "540,12,462,400",
 		["templeofearth"] = "287,177,355,345",
 	},
-
 	["moltenfront"] = {
 		["moltenfront"] = "0,0,1024,768",		-- Manual
 	},
-
+	["darkmoonfaireisland"] = {
+		["darkmoonfaireisland"] = "0,0,1024,768",
+	},
 }
 
 --------