Merge pull request #386 from artscout/master

Guide and map fixes
IrcDirk · Oct 4, 2024 · 38a19bb · 38a19bb
2 parents e43565e + f1cdd58
commit 38a19bb
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 25 deletions.
diff --git a/Carbonite/Data/MapWorldHotspots.lua b/Carbonite/Data/MapWorldHotspots.lua
@@ -60,6 +60,7 @@ Nx.MapWorldHotspots2 = {
 		[1458] = "6660008c7fff",
 		[1941] = "1ff066c63dfe",
 		[1942] = "064130f31d95",
+		[1954] = "7930cc865ecb",
 		[124] = "3fe3ff7fd7fd",
 		[201] = "39c000a429b579769d6236c7",
 		[204] = "0d3000a00fff921107430633",

diff --git a/Carbonite/Data/ZoneConnections.lua b/Carbonite/Data/ZoneConnections.lua
@@ -76,20 +76,19 @@ Nx.ZoneConnections = {
 	"7|1||1412|38.97|19.09||1456|51.17|31.54", -- [73]
 	"7|1||1412|42.13|20.2||1456|51.17|31.54", -- [74]
 	"7|1||1947|74.04|53.76||1943|37|47.02", -- [75]
-	"2|0|"..L["Portal to Darnassus"].."|1955|55.21|36.45||1457|39.69|82.44", -- [76]
-	"2|0|"..L["Portal to Stormwind"].."|1955|55.78|36.66||1453|49.59|86.53", -- [77]
-	"2|0|"..L["Portal to Ironforge"].."|1955|56.31|36.99||1455|25.51|8.43", -- [78]
-	"2|0|"..L["Portal to Exodar"].."|1955|59.52|46.65||1947|47.62|59.82", -- [79]
+	"2|0|"..L["Portal to Stormwind"].."|1955|57.2|48.3||1453|49.59|86.53", -- [77]
+	"4|0|"..L["Portal to Orgrimmar"].."|1955|56.8|48.8||1454|38.64|85.94", -- [82]
 	"6|0|"..L["Portal to Isle of Quel'Danas"].."|1955|48.62|42.05||1957|48.25|34.48", -- [80]
-	"4|0|"..L["Portal to Thunder Bluff"].."|1955|52.78|53.02||1456|22.21|16.87", -- [81]
-	"4|0|"..L["Portal to Orgrimmar"].."|1955|52.21|52.82||1454|38.64|85.94", -- [82]
-	"4|0|"..L["Portal to Undercity"].."|1955|51.67|52.49||1458|84.58|16.33", -- [83]
-	"4|0|"..L["Portal to Silvermoon"].."|1955|59.14|48.29||1954|58.26|19.24", -- [84]
-	"3|2|"..L["Boat to Wetlands"].."|1445|71.54|56.37|"..L["Boat to Dustwallow Marsh"].."|1437|5.03|63.46", -- [85]
+--	"2|0|"..L["Portal to Darnassus"].."|1955|55.21|36.45||1457|39.69|82.44", -- [76]
+--	"2|0|"..L["Portal to Ironforge"].."|1955|56.31|36.99||1455|25.51|8.43", -- [78]
+--	"2|0|"..L["Portal to Exodar"].."|1955|59.52|46.65||1947|47.62|59.82", -- [79]
+--	"4|0|"..L["Portal to Thunder Bluff"].."|1955|52.78|53.02||1456|22.21|16.87", -- [81]
+--	"4|0|"..L["Portal to Undercity"].."|1955|51.67|52.49||1458|84.58|16.33", -- [83]
+--	"4|0|"..L["Portal to Silvermoon"].."|1955|59.14|48.29||1954|58.26|19.24", -- [84]
+	"3|2|"..L["Boat to Wetlands"].."|1445|71.54|56.37|"..L["Boat to Dustwallow Marsh"].."|1437|6.03|62.46", -- [85]
 	"3|3|"..L["Tram to Stormwind City"].."|1455|72.78|50.24|"..L["Tram to Ironforge"].."|1453|66.37|34.13", -- [86]
-	"3|2|"..L["Boat to Stormwind City"].."|1439|32.39|43.82|"..L["Boat to Darkshore"].."|1453|22.42|55.95", -- [87]
-	"3|2|"..L["Boat to Teldrassil"].."|1439|33.18|40.1|"..L["Boat to Darkshore"].."|1438|54.87|96.8", -- [88]
-	"3|2|"..L["Boat to Azuremyst Isle"].."|1439|30.74|41|"..L["Boat to Darkshore"].."|1943|21.33|54.06", -- [89]
+	"3|2|"..L["Boat to Stormwind City"].."|1438|55.1|93.8|"..L["Boat to Teldrassil"].."|1453|22.42|55.95", -- [87]
+	"3|2|"..L["Boat to Azuremyst Isle"].."|1438|52.11|89.3|"..L["Boat to Teldrassil"].."|1943|21.33|54.06", -- [89]
 	"5|5|"..L["Zeppelin to Stranglethorn Vale"].."|1420|61.87|59.07|"..L["Zeppelin to Undercity"].."|1434|31.56|29.13", -- [90]
 	"5|5|"..L["Zeppelin to Undercity"].."|1411|50.88|13.87|"..L["Zeppelin to Orgrimmar"].."|1420|60.7|58.78", -- [91]
 	"5|5|"..L["Zeppelin to Stranglethorn Vale"].."|1411|50.57|12.64|"..L["Zeppelin to Orgrimmar"].."|1434|31.37|30.15", -- [92]
@@ -121,16 +120,16 @@ Nx.ZoneConnections = {
 	"7|1||127|58.5|34.51||118|89.4|83.62",
 
 	"2|0|"..L["Portal to Stormwind"].."|125|40.13|62.86||1453|49.59|86.53",
-        "2|0|"..L["Portal to Ironforge"].."|125|39.49|63.99||1455|25.51|8.43",
-        "2|0|"..L["Portal to Darnassus"].."|125|38.86|65.18||1457|39.69|82.44",
-        "2|0|"..L["Portal to Exodar"].."|125|38.16|66.38||1947|47.62|59.82",
-        "2|0|"..L["Portal to Shattrath"].."|125|37.1|66.81||1955|55.09|40.22",
+--        "2|0|"..L["Portal to Ironforge"].."|125|39.49|63.99||1455|25.51|8.43",
+--        "2|0|"..L["Portal to Darnassus"].."|125|38.86|65.18||1457|39.69|82.44",
+--        "2|0|"..L["Portal to Exodar"].."|125|38.16|66.38||1947|47.62|59.82",
+--        "2|0|"..L["Portal to Shattrath"].."|125|37.1|66.81||1955|55.09|40.22",
 
 	"4|0|"..L["Portal to Orgrimmar"].."|125|55.41|25.48||1454|0|0",
-	"4|0|"..L["Portal to Thunder Bluff"].."|125|57.2|21.8||1456|22.21|16.87",
-	"4|0|"..L["Portal to Undercity"].."|125|55.6|23.9||1458|84.58|16.33",
-	"4|0|"..L["Portal to Silvermoon"].."|125|58.3|21.6||1954|58.26|19.24",
-	"4|0|"..L["Portal to Shattrath"].."|125|56.3|22.6||1955|55.09|40.22",
+--	"4|0|"..L["Portal to Thunder Bluff"].."|125|57.2|21.8||1456|22.21|16.87",
+--	"4|0|"..L["Portal to Undercity"].."|125|55.6|23.9||1458|84.58|16.33",
+--	"4|0|"..L["Portal to Silvermoon"].."|125|58.3|21.6||1954|58.26|19.24",
+--	"4|0|"..L["Portal to Shattrath"].."|125|56.3|22.6||1955|55.09|40.22",
 
         "7|0|"..L["Portal to Dalaran"].."|127|15.3|41.5||125|55.95|46.75",
 	"7|0|"..L["Portal to Caverns of Time"].."|125|25.6|51.5||1446|65.9|49.8",
@@ -140,11 +139,11 @@ Nx.ZoneConnections = {
        -- Alliance
        "2|0|"..L["Portal to Blasted Lands"].."|1453|49.0|87.3||1419|57.5|51.1", -- from Stormwind
        "2|0|"..L["Portal to Blasted Lands"].."|1455|27.3|7.0||1419|57.5|51.1", -- from IronForge
-       "2|0|"..L["Portal to Blasted Lands"].."|1457|40.6|81.7||1419|50.4|81.7", -- from Darnassus
-       "2|0|"..L["Portal to Blasted Lands"].."|1947|46.2|60.9||1419|50.4|81.7", -- from Exodar
+       "2|0|"..L["Portal to Blasted Lands"].."|1457|44.1|78.5||1419|50.4|81.7", -- from Darnassus
+       "2|0|"..L["Portal to Blasted Lands"].."|1947|48.1|63.1||1419|50.4|81.7", -- from Exodar
 
        -- Horde
-       "4|0|"..L["Portal to Blasted Lands"].."|1454|38.1|85.7||1419|50.4|81.7", -- from Orgrimmar
+       "4|0|"..L["Portal to Blasted Lands"].."|86|44.8|67.8||1419|50.4|81.7", -- from Orgrimmar
        "4|0|"..L["Portal to Blasted Lands"].."|1456|23.2|13.6||1419|50.4|81.7", -- from Thunder Bluff
        "4|0|"..L["Portal to Blasted Lands"].."|1458|85.2|17||1419|50.4|81.7", -- from Undercity
        "4|0|"..L["Portal to Blasted Lands"].."|1954|58.4|21.0||1419|50.4|81.7", -- from Silvermoon

diff --git a/Carbonite/Data/Zones.lua b/Carbonite/Data/Zones.lua
@@ -74,7 +74,7 @@ Nx.Zones = {
     [1452] = L["Winterspring"] .. "|55|60|2|1||",
     [1453] = L["Stormwind City"] .. "|0|0|0|2||",
     [1454] = L["Orgrimmar"] .. "|0|0|1|1||",
-	--[86] = L["Orgrimmar"] .. "|0|0|1|1||",
+	[86] = L["Orgrimmar"] .. "|0|0|1|1||",
     [1455] = L["Ironforge"] .. "|0|0|0|2||",
     [1456] = L["Thunder Bluff"] .. "|0|0|1|1||",
     [1457] = L["Darnassus"] .. "|0|0|0|1||",

diff --git a/Carbonite/NxMap.lua b/Carbonite/NxMap.lua
@@ -9178,7 +9178,7 @@ function Nx.Map:InitTables()
 
 	Nx.Map.MapZones = {
 		[0] = {12,13,1945,113,948,0,-1},
-		[1] = {1411,1412,1413,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1454,1456,1457,1943,1947,1950,198,199,249,327,338},
+		[1] = {1411,1412,1413,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1454,86,1456,1457,1943,1947,1950,198,199,249,327,338},
 		[2] = {1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1453,1455,1458,1941,1942,1954,1957,124,179,201,202,204,205,203,210,217,218,224,241,244,245},
 		[3] = {1944,1946,1948,1949,1951,1952,1953,1955},
 		[4] = {114,115,116,117,118,119,120,121,123,125,127,170},

diff --git a/Carbonite/NxMapData.lua b/Carbonite/NxMapData.lua
@@ -440,6 +440,16 @@ Map.MapWorldInfo = {
 		City = true,
 		MMOutside = true,
 	},
+	[86] = {
+		Scale = 3.47875,
+		X = 701.27080078125,
+		Y = -497.33334960938,
+		Overlay = "orgrimmar",
+		MapBaseName = "orgrimmar1_",
+		Name = L["Orgrimmar"],
+		City = true,
+		MMOutside = true,
+	},
 	[1455] = {
 		Scale = 1.5812501220703,
 		X = 142.71827392578,
@@ -629,6 +639,7 @@ Map.MapWorldInfo = {
 		Y = 294.79089355469,
 		Overlay = "shattrathcity",
 		Name = L["Shattrath City"],
+		City = true,
 		MMOutside = true,
 	},
 	[1956] = {