Fixed issue 140. Added paths for STV sub-zones, did not encounter STV master anywhere. Finished pathing for Worgen starts, up to and including the official path to main world... I just need to go back with another new Worgen to check the start coords for accuracy. Added routes for Ruins of Gilneas and Ruins of Gilneas City (City is its own zone, but isn't triggered reliably or accurately). Adjusted assertion error text for collect_location to be more useful. Made the afflicted function return strings too, since I want as much plain text as possible. It is late, and that seems to be all I can remember.
Cette révision appartient à :
Nathanial.C.Jones
Parent
05aa02c879
révision
e88d9bbd54
|
|
@ -6,20 +6,26 @@ local function signed(c)
|
|||
QuestHelper: Assert(not c or c >= -127 and c < 127)
|
||||
if not c then c = -128 end
|
||||
if c < 0 then c = c + 256 end
|
||||
return strchar(c)
|
||||
return tostring(c)
|
||||
--return strchar(c)
|
||||
end
|
||||
|
||||
local function float(c)
|
||||
--[[
|
||||
local orig_c = c
|
||||
if c then
|
||||
c = math.floor(c * 16777216 + 0.5) -- 24 bits of fraction baby
|
||||
QuestHelper: Assert(c >= -2147483648, string.format("c is too big. It was %s, and now is %s.", tostring(orig_c), tostring(c)))
|
||||
QuestHelper: Assert(c < 2147483647, string.format("c is too small. It was %s, and now is %s.", tostring(orig_c), tostring(c)))
|
||||
QuestHelper: Assert(c >= -2147483648, string.format("c is too small. It was %s, and now is %s.", tostring(orig_c), tostring(c)))
|
||||
QuestHelper: Assert(c < 2147483647, string.format("c is too big. It was %s, and now is %s.", tostring(orig_c), tostring(c)))
|
||||
else
|
||||
c = -2147483648
|
||||
end
|
||||
if c < 0 then c = c + 4294967296 end
|
||||
return strchar(bit.band(c, 0xff), bit.band(c, 0xff00) / 256, bit.band(c, 0xff0000) / 65536, bit.band(c, 0xff000000) / 16777216)
|
||||
--]]
|
||||
QuestHelper: Assert( c >= -128, string.format("c is too small. It is %s.", tostring(c)))
|
||||
QuestHelper: Assert( c < 128, string.format("c is too big. It is %s.", tostring(c)))
|
||||
return tostring(c)
|
||||
end
|
||||
|
||||
local function BolusizeLocation(delayed, c, z, x, y)
|
||||
|
|
|
|||
|
|
@ -204,6 +204,9 @@ function Astrolabe:GetMapVirtualZones(zone)
|
|||
if mapFileName == "RuinsofGilneasCity" then
|
||||
zones[k] = "Gilneas"
|
||||
break
|
||||
elseif mapFileName == "Hyjal_terrain1" then
|
||||
zones[k] = "Hyjal"
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -47,14 +47,15 @@ local static_alliance_routes =
|
|||
{{12,0.462,0.609}, BLASTED_LANDS_PORTAL, 60, true, level_limit = 58}, -- Exodar --> Blasted Lands
|
||||
{{25,0.273,0.071}, BLASTED_LANDS_PORTAL, 60, true, level_limit = 58}, -- Ironforge --> Blasted Lands
|
||||
{{36,0.490,0.874}, BLASTED_LANDS_PORTAL, 60, true, level_limit = 58}, -- Stormwind --> Blasted Lands
|
||||
{{169, 0.5, 0.5}, {207, 0.5, 0.5}, 86400}, -- Ruins of Gilneas <--> Gilneas Zone. Exists solely to fix some pathing crashes. 24-hour boat ride :D (We want to make an adjustment to the coords though.)
|
||||
{{207, 0.5, 0.5}, {205, 0.29, 0.22}, 5}, -- Gilneas Zone <--> Gilneas City. Exists solely to fix some pathing crashes. 24-hour boat ride :D (We want to make an adjustment to the coords though.)
|
||||
{{2, 0.5, 0.5}, {169, 0.5, 0.5}, 172800}, -- Ashenvale <--> Ruins of Gilneas. Exists solely to fix some pathing crashes. 48-hour boat ride :D (This will be deleted later, when we can create the "official" path.)
|
||||
{{207, 0.54, 0.60}, {205, 0.30, 0.72}, 10}, -- Gilneas Zone <--> Greymane Court, Gilneas City. Exists solely to fix some pathing crashes. (We want to make an adjustment to the coords though.)
|
||||
{{207, 0.55, 0.42}, {205, 0.28, 0.21}, 5}, -- Gilneas Zone <--> Cathedral Square, Gilneas City. Exists solely to fix some pathing crashes. (We want to make an adjustment to the coords though.)
|
||||
{{207, 0.66, 0.42}, {205, 0.67, 0.20}, 5}, -- Gilneas Zone <--> Merchant Square, Gilneas City. Exists solely to fix some pathing crashes. (We want to make an adjustment to the coords though.)
|
||||
{{207, 0.68, 0.62}, {205, 0.69, 0.82}, 10}, -- Gilneas Zone <--> Military District, Gilneas City. Exists solely to fix some pathing crashes. (We want to make an adjustment to the coords though.)
|
||||
{{207, 0.42, 0.36}, {24, 0.52, 0.89}, 86400}, -- Gilneas Zone <--> Teldrassil. Exists solely to fix some pathing crashes. 24-hour boat ride :D (This will be deleted later, when we can create the "official" path.)
|
||||
}
|
||||
|
||||
local static_shared_routes =
|
||||
{
|
||||
{{11, 0.638, 0.387}, {38, 0.257, 0.73}, 210}, -- Ratchet <--> Booty Bay
|
||||
{{40, 0.318, 0.503}, {32, 0.347, 0.84}, 130}, -- Burning Steppes <--> Searing Gorge
|
||||
|
||||
-- More Alliance routes than anything, but without them theres no valid path to these areas for Horde characters.
|
||||
|
|
@ -80,9 +81,14 @@ local static_shared_routes =
|
|||
{{62, 0.39, 0.60}, {28, 0.00, 0.20}, 5}, -- The Great Sea (EK Continent, zone 0) <--> Dun Morogh
|
||||
{{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
|
||||
{{185, 0.85, 0.41}, {19, 0.58, 0.91}, 5}, -- Hyjal <--> Winterspring
|
||||
{{198, 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
|
||||
{{174, 0.61, 0.20}, {168, 0.50, 0.74}, 5}, -- CoS <--> NS (Both part of STV)
|
||||
{{35, 0.45, 0.85}, {169, 0.60, 0.09}, 5}, -- Silverpine <--> Ruins of Gilneas
|
||||
{{169, 0.5, 0.5}, {170, 0.5, 0.5}, 5}, -- Ruins of Gilneas <--> Ruins of Gilneas City (Meta info, map doesn't change properly as of 2010-12-11-0156UET)
|
||||
|
||||
-- Wrath instance entrances
|
||||
{{80, 0.693, 0.730}, {70, 0.573, 0.467}, 5}, -- UK
|
||||
{{86, 0.362, 0.880}, {65, 0.275, 0.260}, 5}, -- Nexus
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ QuestHelper_IndexLookup =
|
|||
["ThunderBluff"] = {23, 1, 25},
|
||||
["Teldrassil"] = {24, 1, 22},
|
||||
["Ironforge"] = {25, 2, 14},
|
||||
["Alterac"] = {26, 2, 1},
|
||||
--["Alterac"] = {26, 2, 1},
|
||||
["Badlands"] = {27, 2, 3},
|
||||
["DunMorogh"] = {28, 2, 7},
|
||||
["LochModan"] = {29, 2, 17},
|
||||
|
|
@ -249,31 +249,29 @@ QuestHelper_IndexLookup =
|
|||
["Northrend"] = {76, 4, 0},
|
||||
|
||||
["HrothgarsLanding"] = {153, 4, 7}, -- wooo consecutive numbering
|
||||
|
||||
["AhnQirajTheFallenKingdom"] = {158, 1, 1},
|
||||
|
||||
|
||||
|
||||
["Hyjal"] = {198, 1, 14},
|
||||
["Hyjal"] = {198, 1, 14}, -- Check
|
||||
["SouthernBarrens"] = {203, 1, 19},
|
||||
["Uldum"] = {164, 1, 26},
|
||||
["VashjirDepths"] = {165, 2, 1},
|
||||
["VashjirKelpForest"] = {167, 2, 16},
|
||||
["Uldum"] = {164, 1, 26}, -- Check
|
||||
["VashjirDepths"] = {165, 2, 1}, -- Check
|
||||
["VashjirKelpForest"] = {167, 2, 16}, -- Check
|
||||
["StranglethornJungle"] = {168, 2, 18},
|
||||
["RuinsofGilneas"] = {169, 2, 20},
|
||||
["RuinsofGilneasCity"] = {170, 2, 21},
|
||||
["VashjirRuins"] = {171, 2, 23},
|
||||
["VashjirRuins"] = {171, 2, 23}, -- Check
|
||||
["TheCapeOfStranglethorn"] = {174, 2, 29},
|
||||
["TolBarad"] = {175, 2, 32},
|
||||
["TolBaradDailyArea"] = {176, 2, 33},
|
||||
["TwilightHighlands_terrain1"] = {177, 2, 34},
|
||||
["Vashjir"] = {178, 2, 36},
|
||||
["Vashjir"] = {178, 2, 36}, -- Check
|
||||
["Deepholm"] = {179, 5, 1},
|
||||
["Kezan"] = {180, 5, 2},
|
||||
["TheLostIsles"] = {181, 5, 3},
|
||||
["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},
|
||||
|
|
|
|||
Référencer dans un nouveau ticket