Made some elder coordinates more accurate and made it possible to place the locations in non-english localizations. Caveat: Users must do the look up with the US English name.
Cette révision appartient à :
Nathanial.C.Jones
Parent
d2b911d1e6
révision
3a73da94ac
|
|
@ -72,17 +72,19 @@ end
|
|||
local msfires = {desc = QHText("FIND_CUSTOM_LOCATION"), tracker_desc = QHText("FIND_CUSTOM_LOCATION")}
|
||||
|
||||
local function QH_FindCoord(locx, locy, locz, label)
|
||||
for z, nam in pairs(QuestHelper_NameLookup) do
|
||||
if nam:lower():find(locz:lower()) then
|
||||
locz = z
|
||||
break
|
||||
if not type(locz) == "number" then -- If it is a number, we are probably doing an elder right now.
|
||||
for z, nam in pairs(QuestHelper_NameLookup) do
|
||||
if nam:lower():find(locz:lower()) then
|
||||
locz = z
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if type(locz) == "number" then
|
||||
local ec, ez = unpack(QuestHelper_ZoneLookup[locz])
|
||||
local c, x, y = QuestHelper.Astrolabe:GetAbsoluteContinentPosition(ec, ez, locx / 100, locy / 100)
|
||||
local node = {loc = {x = x, y = y, p = locz, c = QuestHelper_ParentLookup[locz]}, why = {desc = labee, tracker_desc = labee}, map_desc = {label}, tracker_desc = label, tracker_hidden = true}
|
||||
local node = {loc = {x = x, y = y, p = locz, c = QuestHelper_ParentLookup[locz]}, why = {desc = label, tracker_desc = label}, map_desc = {label}, tracker_desc = label, tracker_hidden = true}
|
||||
local cluster = {node}
|
||||
node.cluster = cluster
|
||||
|
||||
|
|
@ -115,76 +117,76 @@ end
|
|||
|
||||
local elders = {
|
||||
["Alliance"] = {
|
||||
["Bladeswift"] = "Darnassus 39 32",
|
||||
["Bronzebeard"] = "Ironforge 29 16",
|
||||
["Hammershout"] = "Elwynn Forest 34 50"
|
||||
["Bladeswift"] = {21, 39, 32}, --"Darnassus 39 32",
|
||||
["Bronzebeard"] = {25, 29, 16}, --"Ironforge 29 16",
|
||||
["Hammershout"] = {37, 2, 10}, --"Elwynn Forest 34 50"
|
||||
},
|
||||
["Horde"] = {
|
||||
["Darkhorn"] = "Orgrimmar 52 60",
|
||||
["Wheathoof"] = "Thunder Bluff 72 33",
|
||||
["Darkcore"] = "Undercity 67 38"
|
||||
["Darkhorn"] = {1, 52, 60}, --"Orgrimmar 52 60",
|
||||
["Wheathoof"] = {23, 72, 33}, --"Thunder Bluff 72 33",
|
||||
["Darkcore"] = {45, 67, 38}, --"Undercity 67 38"
|
||||
},
|
||||
["Kalimdor"] = {
|
||||
["Riversong"] = "Ashenvale 35 48",
|
||||
["Skygleam"] = "Azshara 64 79",
|
||||
["High Mountain"] = "Southern Barrens 41 47", -- 41.5 47.5
|
||||
["Moonwarden"] = "Northern Barrens 48 59", -- 48.5 59.2
|
||||
["Windtotem"] = "Northern Barrens 68 69",
|
||||
["Starweave"] = "Darkshore 49 19", -- 49.5 19.0
|
||||
["Runetotem"] = "Durotar 54 44",
|
||||
["Nightwind"] = "Felwood 37 52",
|
||||
["Grimtotem"] = "Feralas 76 37",
|
||||
["Mistwalker"] = "Feralas 62 31",
|
||||
["Bloodhoof"] = "Mulgore 48 53",
|
||||
["Bladesing"] = "Silithus 53 35",
|
||||
["Primestone"] = "Silithus 30 13", -- 30.7 13.3
|
||||
["Dreamseer"] = "Tanaris 50 28",
|
||||
["Ragetotem"] = "Tanaris 36 80",
|
||||
["Bladeleaf"] = "Teldrassil 57 53",
|
||||
["Skyseer"] = "Thousand Needles 45 50",
|
||||
["Morningdew"] = "Thousand Needles 77 75", -- 77.0 75.6
|
||||
["Thunderhorn"] = "Un'Goro Crater 51 75",
|
||||
["Brightspear"] = "Winterspring 53 56", -- 53.0 56.7
|
||||
["Stonespire"] = "Winterspring 60 50", -- 60.0 50.0
|
||||
["Riversong"] = {2, 35, 48}, --"Ashenvale 35 48",
|
||||
["Skygleam"] = {15, 64, 79}, --"Azshara 64 79",
|
||||
["High Mountain"] = {203, 41.5, 47.5}, --"Southern Barrens 41.5 47.5",
|
||||
["Moonwarden"] = {11, 48.5, 59.2}, --"Northern Barrens 48.5 59.2",
|
||||
["Windtotem"] = {11, 68, 69}, --"Northern Barrens 68 69",
|
||||
["Starweave"] = {16, 49.5, 19.0}, --"Darkshore 49.5 19.0", NOTE TO SELF -- CONVERTING TO LOOKUP VALUES DON'T FORGET TO CHANGE THE FUNCTION!!!!!!!
|
||||
["Runetotem"] = {7, 54, 44}, --"Durotar 54 44",
|
||||
["Nightwind"] = {13, 37, 52}, --"Felwood 37 52",
|
||||
["Grimtotem"] = {17, 76, 37}, --"Feralas 76 37",
|
||||
["Mistwalker"] = {17, 62, 31}, --"Feralas 62 31",
|
||||
["Bloodhoof"] = {22, 48, 53}, --"Mulgore 48 53",
|
||||
["Bladesing"] = {5, 53, 35}, --"Silithus 53 35",
|
||||
["Primestone"] = {5, 30.7, 13.3}, --"Silithus 30.7 13.3",
|
||||
["Dreamseer"] = {8, 50, 28}, --"Tanaris 50 28",
|
||||
["Ragetotem"] = {8, 36, 80}, --"Tanaris 36 80",
|
||||
["Bladeleaf"] = {24, 57, 73}, --"Teldrassil 57 53",
|
||||
["Skyseer"] = {14, 45, 50}, --"Thousand Needles 45 50",
|
||||
["Morningdew"] = {14, 77.0, 75.6}, --"Thousand Needles 77.0 75.6",
|
||||
["Thunderhorn"] = {18, 51, 75}, --"Un'Goro Crater 51 75",
|
||||
["Brightspear"] = {19, 53.0, 56.7}, --"Winterspring 53.0 56.7",
|
||||
["Stonespire"] = {19, 60.0, 50.0}, --"Winterspring 60.0 50.0",
|
||||
},
|
||||
["Eastern Kingdoms"] = {
|
||||
["Bellowrage"] = "Blasted Lands 54 49",
|
||||
["Rumblerock"] = "Burning Steppes 70 45",
|
||||
["Dawnstrider"] = "Burning Steppes 53 24",
|
||||
["Goldwell"] = "Dun Morogh 53 49",
|
||||
["Windrun"] = "Eastern Plaguelands 35 68",
|
||||
["Snowcrown"] = "Eastern Plaguelands 75 54",
|
||||
["Stormbrow"] = "Elwynn Forest 40 63",
|
||||
["Highpeak"] = "Hinterlands 50 48",
|
||||
["Silvervein"] = "Loch Modan 33 46",
|
||||
["Ironband"] = "Searing Gorge 21 79",
|
||||
["Obsidian"] = "Silverpine Forest 45 41",
|
||||
["Starglade"] = "Stranglethorn Vale 63 22", -- Jungle 71 34
|
||||
["Winterhoof"] = "Stranglethorn Vale 37 79", -- Cape 39 72
|
||||
["Graveborn"] = "Tirisfal Glades 61 53",
|
||||
["Moonstrike"] = "Western Plaguelands 69 73",
|
||||
["Meadowrun"] = "Western Plaguelands 63 36",
|
||||
["Skychaser"] = "Westfall 56 47"
|
||||
["Bellowrage"] = {33, 54, 49}, --"Blasted Lands 54 49",
|
||||
["Rumblerock"] = {40, 70, 45}, --"Burning Steppes 70 45",
|
||||
["Dawnstrider"] = {40, 53, 24}, --"Burning Steppes 53 24",
|
||||
["Goldwell"] = {28, 53, 49}, --"Dun Morogh 53 49",
|
||||
["Windrun"] = {34, 35, 68}, --"Eastern Plaguelands 35 68",
|
||||
["Snowcrown"] = {34, 35, 68}, --"Eastern Plaguelands 75.7 54.5",
|
||||
["Stormbrow"] = {37, 40, 63}, --"Elwynn Forest 40 63",
|
||||
["Highpeak"] = {42, 50, 48}, --"Hinterlands 50 48",
|
||||
["Silvervein"] = {29, 33, 46}, --"Loch Modan 33 46",
|
||||
["Ironband"] = {32, 21, 79}, --"Searing Gorge 21 79",
|
||||
["Obsidian"] = {35, 45, 41}, --"Silverpine Forest 45 41",
|
||||
["Starglade"] = {38, 63, 22}, --"Stranglethorn Vale 63 22", -- Jungle 71 34
|
||||
["Winterhoof"] = {38, 37, 39}, --"Stranglethorn Vale 37 79", -- Cape 39 72
|
||||
["Graveborn"] = {43, 61, 53}, --"Tirisfal Glades 61 53",
|
||||
["Moonstrike"] = {50, 69, 73}, --"Western Plaguelands 69 73",
|
||||
["Meadowrun"] = {50, 63, 36}, --"Western Plaguelands 63 36",
|
||||
["Skychaser"] = {49, 56, 47}, --"Westfall 56 47"
|
||||
},
|
||||
["Northrend"] = {
|
||||
["Arp"] = "Borean Tundra 57 44",
|
||||
["Northal"] = "Borean Tundra 34 34",
|
||||
["Pamuya"] = "Borean Tundra 43 50",
|
||||
["Sardis"] = "Borean Tundra 59 66",
|
||||
["Morthie"] = "Dragonblight 30 56",
|
||||
["Skywarden"] = "Dragonblight 35 48",
|
||||
["Thoim"] = "Dragonblight 49 78",
|
||||
["Beldak"] = "Grizzly Hills 61 28",
|
||||
["Lunaro"] = "Grizzly Hills 81 37",
|
||||
["Whurain"] = "Grizzly Hills 64 47",
|
||||
["Bluewolf"] = "Wintergrasp 49 14",
|
||||
["Sandrene"] = "Sholazar Basin 50 64",
|
||||
["Wanikaya"] = "Sholazar Basin 64 49",
|
||||
["Fargal"] = "Storm Peaks 29 74",
|
||||
["Graymane"] = "Storm Peaks 41 85",
|
||||
["Muraco"] = "Storm Peaks 64 51",
|
||||
["Stonebeard"] = "Storm Peaks 31 38",
|
||||
["Tauros"] = "Zul'Drak 59 56"
|
||||
["Arp"] = {65, 57, 44}, --"Borean Tundra 57 44",
|
||||
["Northal"] = {65, 34, 34}, --"Borean Tundra 34 34",
|
||||
["Pamuya"] = {65, 43, 50}, --"Borean Tundra 43 50",
|
||||
["Sardis"] = {65, 59, 66}, --"Borean Tundra 59 66",
|
||||
["Morthie"] = {68, 30, 56}, --"Dragonblight 30 56",
|
||||
["Skywarden"] = {68, 35, 48}, --"Dragonblight 35 48",
|
||||
["Thoim"] = {68, 49, 78}, --"Dragonblight 49 78",
|
||||
["Beldak"] = {69, 61, 28}, --"Grizzly Hills 61 28",
|
||||
["Lunaro"] = {69, 81, 37}, --"Grizzly Hills 81 37",
|
||||
["Whurain"] = {69, 64, 47}, --"Grizzly Hills 64 47",
|
||||
["Bluewolf"] = {74, 49, 14}, --"Wintergrasp 49 14",
|
||||
["Sandrene"] = {72, 50, 64}, --"Sholazar Basin 50 64",
|
||||
["Wanikaya"] = {72, 64, 49}, --"Sholazar Basin 64 49",
|
||||
["Fargal"] = {73, 29, 74}, --"Storm Peaks 29 74",
|
||||
["Graymane"] = {73, 41, 85}, --"Storm Peaks 41 85",
|
||||
["Muraco"] = {73, 64, 51}, --"Storm Peaks 64 51",
|
||||
["Stonebeard"] = {73, 31, 38}, --"Storm Peaks 31 38",
|
||||
["Tauros"] = {75, 59, 56}, --"Zul'Drak 59 56"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -198,19 +200,16 @@ local function QH_FindElders(elder_or_achievement, all_elders)
|
|||
for elder, elder_loc in pairs(eldrs) do
|
||||
if not all_elders then
|
||||
if achievement_match then -- just add it
|
||||
local locz, locx, locy = elder_loc:match("^(.+) (%d+) (%d+)$")
|
||||
locx, locy = tonumber(locx), tonumber(locy)
|
||||
local locx, locy, locz = unpack(elder_loc)
|
||||
QH_FindCoord(locx, locy, locz, elder)
|
||||
elseif elder_or_achievement == string.upper(elder) then -- We have input and it's not an achievement, so it must be an elder.
|
||||
elder_match = true
|
||||
local locz, locx, locy = elder_loc:match("^(.+) (%d+) (%d+)$")
|
||||
locx, locy = tonumber(locx), tonumber(locy)
|
||||
local locx, locy, locz = unpack(elder_loc)
|
||||
QH_FindCoord(locx, locy, locz, elder)
|
||||
break -- We've found him or her.
|
||||
end -- No need for else here. We alread know we don't need everything so we either have an achievement or we have an elder.
|
||||
else -- We came in without an input, therefore we add all.
|
||||
local locz, locx, locy = elder_loc:match("^(.+) (%d+) (%d+)$")
|
||||
locx, locy = tonumber(locx), tonumber(locy)
|
||||
local locx, locy, locz = unpack(elder_loc)
|
||||
QH_FindCoord(locx, locy, locz, elder)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Référencer dans un nouveau ticket