1
0
Bifurcation 0

The only pathing remaining is Maelstrom and goblin start zones. Issue 139 is now resolved as well.

Cette révision appartient à :
Nathanial.C.Jones 2010-12-12 00:55:58 +00:00
Parent e88d9bbd54
révision c3865045f1
6 fichiers modifiés avec 40 ajouts et 21 suppressions

Voir le fichier

@ -36,7 +36,9 @@ local function BolusizeLocation(delayed, c, z, x, y)
-- if x and y then print(delayed, c, z, x, y) end
local float_x = float(x)
local float_y = float(y)
return signed(delayed and 1 or 0) .. signed(c) .. signed(z) .. float_x .. float_y
--print(x, y)
return string.format("%s %s %s %s %s", signed(delayed and 1 or 0), signed(c), signed(z), float_x, float_y)
--return signed(delayed and 1 or 0) .. signed(c) .. signed(z) .. float_x .. float_y
end
-- This merely provides another API function

Voir le fichier

@ -530,8 +530,12 @@ local function LootOpened()
local _, _, amount = string.find(name, Patterns.COPPER_AMOUNT)
if amount then items.gold = items.gold + tonumber(amount) * 1 end
else
local itype = GetItemType(link)
items[itype] = (items[itype] or 0) + quant
if string.find(name, "Archaeology Fragment") then
items[name] = (items[name] or 0) + quant
else
local itype = GetItemType(link)
items[itype] = (items[itype] or 0) + quant
end
end
end

Voir le fichier

@ -26,6 +26,7 @@ local function GetMonsterType(guid)
end
local function GetItemType(link, vague)
QuestHelper:Assert(link, "Item did not have a link! Say WHAT?")
return tonumber(string.match(link,
(vague and "" or "^") .. "|cff%x%x%x%x%x%x|Hitem:(%d+):[%d:-]+|h%[[^%]]*%]|h|r".. (vague and "" or "$")
))

Voir le fichier

@ -204,9 +204,6 @@ function Astrolabe:GetMapVirtualZones(zone)
if mapFileName == "RuinsofGilneasCity" then
zones[k] = "Gilneas"
break
elseif mapFileName == "Hyjal_terrain1" then
zones[k] = "Hyjal"
break
end
end

Voir le fichier

@ -19,12 +19,12 @@ local BLASTED_LANDS_PORTAL = {33,0.575,0.511, "Blasted Lands portal site"}
local static_horde_routes =
{
-- {{7, 0.505, 0.124}, {38, 0.313, 0.303}, 210}, -- Durotar <--> Grom'gol Base Camp
-- {{38, 0.316, 0.289}, {43, 0.621, 0.591}, 210}, -- Grom'gol Base Camp <--> Tirisfal Glades
-- {{43, 0.605, 0.587}, {7, 0.509, 0.141}, 210}, -- Tirisfal Glades <--> Durotar
{{7, 0.505, 0.124}, {38, 0.313, 0.303}, 210}, -- Durotar <--> Grom'gol Base Camp
{{38, 0.316, 0.289}, {43, 0.621, 0.591}, 210}, -- Grom'gol Base Camp <--> Tirisfal Glades
{{43, 0.605, 0.587}, {7, 0.509, 0.141}, 210}, -- Tirisfal Glades <--> Durotar
{{45, 0.549, 0.11}, {52, 0.495, 0.148}, 60}, -- Undercity <--> Silvermoon City
-- {{7, 0.413, 0.178}, {65, 0.414, 0.536}, 210}, -- Durotar <--> Warsong Hold
{{7, 0.413, 0.178}, {65, 0.414, 0.536}, 210}, -- Durotar <--> Warsong Hold
{{43, 0.591, 0.590}, {70, 0.777, 0.283}, 210}, -- Tirisfal Glades <--> Vengeance Landing
{{1,0.381,0.857}, BLASTED_LANDS_PORTAL, 60, true, level_limit = 58}, -- Orgrimmar --> Blasted Lands
@ -82,6 +82,7 @@ local static_shared_routes =
{{167, 0.40, 0.64}, {171, 0.56, 0.14}, 5}, -- VKF <--> SE
{{178, 0.50, 0.28}, {165, 0.72, 0.04}, 5}, -- Vash <--> Vash'jir Depths
{{198, 0.85, 0.41}, {19, 0.58, 0.91}, 5}, -- Hyjal <--> Winterspring
{{185, 0.85, 0.41}, {19, 0.58, 0.91}, 5}, -- Hyjal <--> Winterspring
{{164, 0.84, 0.41}, {8, 0.37, 0.82}, 5}, -- Uldum <--> Tanaris
{{164, 0.70, 0.22}, {8, 0.25, 0.66}, 5}, -- Uldum <--> Tanaris
{{11, 0.638, 0.387}, {174, 0.257, 0.73}, 210}, -- Ratchet <--> Booty Bay
@ -156,13 +157,14 @@ local dark_portal_route = {{33, 0.587, 0.599}, {56, 0.898, 0.502}, 60}
local static_zone_transitions =
{
{2, 11, 0.687, 0.872}, -- Ashenvale <--> The Barrens
{2, 11, 0.687, 0.872}, -- Ashenvale <--> Northern Barrens
{2, 6, 0.423, 0.711}, -- Ashenvale <--> Stonetalon Mountains
{2, 15, 0.954, 0.484}, -- Ashenvale <--> Azshara
{15, 1, 0.26, 0.79}, -- Azshara <--> Orgrimmar
{2, 16, 0.289, 0.144}, -- Ashenvale <--> Darkshore
{2, 13, 0.557, 0.29}, -- Ashenvale <--> Felwood
{21, 24, 0.894, 0.358}, -- Darnassus <--> Teldrassil
{22, 11, 0.697, 0.604}, -- Mulgore <--> The Barrens
{22, 11, 0.697, 0.604}, -- Mulgore <--> Southern Barrens
{22, 23, 0.376, 0.33}, -- Mulgore <--> Thunder Bluff
{22, 23, 0.403, 0.193}, -- Mulgore <--> Thunder Bluff
{3, 12, 0.247, 0.494}, -- Azuremyst Isle <--> The Exodar
@ -177,14 +179,16 @@ local static_zone_transitions =
{7, 1, 0.455, 0.121}, -- Durotar <--> Orgrimmar
{8, 18, 0.269, 0.516}, -- Tanaris <--> Un'Goro Crater
{8, 14, 0.512, 0.21}, -- Tanaris <--> Thousand Needles
{10, 11, 0.287, 0.472}, -- Dustwallow Marsh <--> The Barrens
{10, 11, 0.563, 0.077}, -- Dustwallow Marsh <--> The Barrens
{11, 14, 0.442, 0.915}, -- The Barrens <--> Thousand Needles
{10, 14, 0.50, 0.94}, -- Dustwallow Marsh <--> Thousand Needles
{10, 203, 0.287, 0.472}, -- Dustwallow Marsh <--> Southern Barrens
{10, 203, 0.531, 0.104}, -- Dustwallow Marsh <--> Southern Barrens
{203, 11, 0.367, 0.048}, -- Southern Barrens <--> Northern Barrens
{11, 14, 0.43, 0.96}, -- Southern Barrens <--> Thousand Needles
{13, 19, 0.685, 0.06}, -- Felwood <--> Winterspring
{13, 20, 0.669, -0.063}, -- Felwood <--> Moonglade
{1, 11, 0.118, 0.69}, -- Orgrimmar <--> The Barrens
{7, 1, 0.37, 0.02}, -- Durotar <--> Orgrimmar
{17, 14, 0.899, 0.46}, -- Feralas <--> Thousand Needles
{6, 11, 0.836, 0.973}, -- Stonetalon Mountains <--> The Barrens
{6, 203, 0.29, 0.08}, -- Stonetalon Mountains <--> The Barrens
--[[ Alterac Mountains no longer exist.
{26, 48, 0.521, 0.7}, -- Alterac Mountains <--> Hillsbrad Foothills
{26, 35, 0.173, 0.482}, -- Alterac Mountains <--> Silverpine Forest
@ -192,8 +196,8 @@ local static_zone_transitions =
--]]
{39, 51, 0.454, 0.89}, -- Arathi Highlands <--> Wetlands
{39, 48, 0.2, 0.293}, -- Arathi Highlands <--> Hillsbrad Foothills
{27, 29, 0.49, 0.071}, -- Badlands <--> Loch Modan
--{27, 32, -0.005, 0.636}, -- Badlands <--> Searing Gorge -- This is the "alliance-only" locked path, I'm disabling it for now entirely
{27, 29, 0.47, 0.071}, -- Badlands <--> Loch Modan
{27, 32, 0.05, 0.53}, -- Badlands <--> Searing Gorge
{33, 46, 0.519, 0.051}, -- Blasted Lands <--> Swamp of Sorrows
{40, 30, 0.79, 0.842}, -- Burning Steppes <--> Redridge Mountains
{47, 31, 0.324, 0.363}, -- Deadwind Pass <--> Duskwood
@ -221,6 +225,7 @@ local static_zone_transitions =
{38, 49, 0.292, 0.024}, -- Stranglethorn Vale <--> Westfall
{48, 35, 0.137, 0.458}, -- Hillsbrad Foothills <--> Silverpine Forest
{48, 42, 0.899, 0.253}, -- Hillsbrad Foothills <--> The Hinterlands
{51, 184, 0.80, 0.47}, -- Wetlands <--> Twilight Highlands
{29, 51, 0.252, 0}, -- Loch Modan <--> Wetlands
-- These are just guesses, since I haven't actually been to these areas.
@ -266,6 +271,14 @@ end
function load_graph_links()
local function convert_coordinate(coord)
QuestHelper: Assert(coord[1] and coord[2] and coord[3])
-- I hate Blizzard... They can't make up their mind weather we are on Hyjal or Hyjal_terrain1, but we only seem to be on one or the other.
if coord[1] == 198 and not QuestHelper_ZoneLookup[coord[1]] then
coord[1] = 185
elseif coord[1] == 185 and not QuestHelper_ZoneLookup[coord[1]] then
coord[1] = 198
end
QuestHelper: Assert(QuestHelper_ZoneLookup[coord[1]], string.format("Coord[1] = %d", coord[1]))
local c, x, y = QuestHelper.Astrolabe:GetAbsoluteContinentPosition(QuestHelper_ZoneLookup[coord[1]][1], QuestHelper_ZoneLookup[coord[1]][2], coord[2], coord[3])
QuestHelper: Assert(c)

Voir le fichier

@ -1,4 +1,6 @@
QuestHelper_File["upgrade.lua"] = "4.0.1.$svnversion$"
local my_version = QuestHelper_File["upgrade.lua"]
QuestHelper_Loadtime["upgrade.lua"] = GetTime()
QuestHelper_Zones =
@ -271,7 +273,7 @@ QuestHelper_IndexLookup =
["TheMaelstrom"] = {182, 5, 4},
["TheMaelstromContinent"] = {183, 5, 0},
["TwilightHighlands"] = {184, 2, 34},
--["Hyjal_terrain1"] = {185, 1, 14},
["Hyjal_terrain1"] = {185, 1, 14},
["ScarletEnclave_Continent"] = {77, -77, 0}, ["ScarletEnclave"] = {78, -77, 1},
@ -395,7 +397,7 @@ function QuestHelper_BuildZoneLookup()
QuestHelper_ErrorCatcher_ExplicitError(false, altered_index:format(tostring(base_name), tostring(next_index), tostring(c), tostring(z)))
next_index = next_index + 1
else
if QuestHelper_Locale == "enUS" then
if QuestHelper_Locale == "enUS" and my_version == "4.0.1.$svnversion$" then
if original_lookup[base_name][2] ~= c or original_lookup[base_name][3] ~= z then
QuestHelper_ErrorCatcher_ExplicitError(false, altered_index:format(base_name, index, c, z))
end