Applying the same patching for Stranglethorn as Alterac.
Cette révision appartient à :
Parent
72dc8f9c2d
révision
32ffc8bfb2
|
@ -286,14 +286,20 @@ function GetAchievementMetaObjective(achievement)
|
|||
if data.chunk then
|
||||
ttx.solid = horribledupe(data.chunk.solid)
|
||||
if data.chunk.loc then for _, v in ipairs(data.chunk.loc) do
|
||||
-- Ugly database hack
|
||||
if v.p == 26 then v.p = 48 end
|
||||
if v.p == 38 then v.p = 168 end
|
||||
-- end hack
|
||||
table.insert(ttx, {loc = {x = v.x, y = v.y, c = QuestHelper_ParentLookup[v.p], p = v.p}})
|
||||
end end
|
||||
end
|
||||
|
||||
if data.loc then
|
||||
ttx.solid = data.solid
|
||||
-- Ugly database hack
|
||||
if data.loc.p == 26 then data.loc.p = 48 end
|
||||
if data.loc.p == 38 then data.loc.p = 168 end
|
||||
-- end hack
|
||||
table.insert(ttx, {loc = {x = data.loc.x, y = data.loc.y, c = QuestHelper_ParentLookup[data.loc.p], p = data.loc.p}})
|
||||
end
|
||||
|
||||
|
|
|
@ -63,7 +63,10 @@ local function generate_objective(dbi)
|
|||
for _, v in ipairs(dbi.loc) do
|
||||
QuestHelper: Assert(QuestHelper_ParentLookup)
|
||||
QuestHelper: Assert(QuestHelper_ParentLookup[v.p], v.p)
|
||||
-- Ugly database hack
|
||||
if v.p == 26 then v.p = 48 end
|
||||
if v.p == 38 then v.p = 168 end
|
||||
-- end hack
|
||||
table.insert(clooster, {loc = {x = v.x, y = v.y, c = QuestHelper_ParentLookup[v.p], p = v.p}, cluster = clooster, tracker_hidden = true, why = why, map_desc = {QuestHelper:HighlightText(dbi.name)}, tracker_desc = dbi.name, map_suppress_ignore = true, map_custom_menu = function (menu) QuestHelper:CreateMenuItem(menu, QHText("FIND_REMOVE")):SetFunction(function () QH_Route_ClusterRemove(clooster) end) end})
|
||||
end
|
||||
|
||||
|
@ -263,7 +266,10 @@ function QH_FindName(name)
|
|||
--[[ assert(dbi) ]]
|
||||
|
||||
if dbi.loc then
|
||||
-- Ugly database hack
|
||||
if dbi.loc.p == 26 then dbi.loc.p = 48 end
|
||||
if dbi.loc.p == 38 then dbi.loc.p = 168 end
|
||||
-- end hack
|
||||
table.insert(found_db, dbi)
|
||||
|
||||
if has_name[dbi.name] then needs_postfix[dbi.name] = true end
|
||||
|
|
|
@ -46,7 +46,10 @@ local function AppendObjlinks(target, source, tooltips, icon, last_name, map_lin
|
|||
for m, v in ipairs(source.loc) do
|
||||
QuestHelper: Assert(target)
|
||||
QuestHelper: Assert(QuestHelper_ParentLookup)
|
||||
-- Ugly database hack
|
||||
if v.p == 26 then v.p = 48 end -- Alterac Mountains merged to Hillsbrad Foothills
|
||||
if v.p == 38 then v.p = 168 end -- Ditto Stranglethorn
|
||||
-- end hack
|
||||
QuestHelper: Assert(QuestHelper_ParentLookup[v.p], v.p)
|
||||
table.insert(target, {loc = {x = v.x, y = v.y, c = QuestHelper_ParentLookup[v.p], p = v.p}, path_desc = copy(map_lines), icon_id = icon or 6})
|
||||
end
|
||||
|
@ -204,7 +207,10 @@ local function GetQuestMetaobjective(questid, lbcount, qindex)
|
|||
--print(v.rc, v.rz)
|
||||
--print(QuestHelper_IndexLookup[v.rc])
|
||||
--print(QuestHelper_IndexLookup[v.rc][v.rz])
|
||||
-- Ugly database hack
|
||||
if v.p == 26 then v.p = 48 end
|
||||
if v.p == 38 then v.p = 168 end
|
||||
-- end hack
|
||||
table.insert(ttx, {desc = "Turn in quest", why = ite, loc = {x = v.x, y = v.y, c = QuestHelper_ParentLookup[v.p], p = v.p}, tracker_hidden = true, cluster = ttx, icon_id = 7, type_quest = ite.type_quest})
|
||||
end
|
||||
end
|
||||
|
|
|
@ -148,11 +148,17 @@ function QH_Graph_Pathmultifind(st, nda, reverse, make_path)
|
|||
--stats.dests_complex = 0
|
||||
--stats.dests_total = 0
|
||||
|
||||
-- Ugly database hack
|
||||
if st.p == 26 then st.p = 48 end -- Alterac Mountains merged to Hillsbrad Foothills
|
||||
if st.p == 38 then st.p = 168 end -- Ditto Stranglethorn
|
||||
-- end hack
|
||||
|
||||
for k, v in ipairs(nda) do
|
||||
QuestHelper: Assert(v.x and v.y and v.p)
|
||||
-- Ugly database hack pt. 2
|
||||
if v.p == 26 then v.p = 48 end -- Alterac Mountains merged to Hillsbrad Foothills
|
||||
if v.p == 38 then v.p = 168 end -- Ditto Stranglethorn
|
||||
-- end hack
|
||||
local cpvp = canoplane(v.p)
|
||||
if plane[cpvp] then
|
||||
--print("Destination plane insertion")
|
||||
|
|
|
@ -514,7 +514,7 @@ local function AddLoc(self, index, x, y, w, why)
|
|||
|
||||
if w > 0 then
|
||||
local pair = QuestHelper_ZoneLookup[index]
|
||||
QuestHelper: Assert(pair, "Index does not exist... it is probably 26 and the value really is... '" .. tostring(index) .. "'")
|
||||
QuestHelper: Assert(pair, "Index does not exist... it is probably 26 or 38 and the value really is... '" .. tostring(index) .. "'")
|
||||
if not pair then return end -- that zone doesn't exist! We require more vespene gas. Not enough rage!
|
||||
local c, z = pair[1], pair[2]
|
||||
x, y = self.qh.Astrolabe:TranslateWorldMapPosition(c, z, x, y, c, 0)
|
||||
|
|
|
@ -329,7 +329,8 @@ local static_zone_transitions =
|
|||
{7, 1, 0.366, 0.253}, -- Durotar <--> Orgrimmar (Side)
|
||||
{15, 1, 0.792, 0.017}, -- Azshara <--> Orgrimmar (Back)
|
||||
{158, 5, 0.687, 0.2}, -- Insect Kingdom I Can't Spell <--> Silithus
|
||||
|
||||
|
||||
{38, 168, 0, 0}, -- Stranglethorn Wonkiness
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1254,7 +1254,10 @@ function QH_Route_Core_ClusterAdd(clust, clustid_used)
|
|||
|
||||
-- if we're doing hackery, clust will just be an empty table and we'll retrofit stuff later
|
||||
for _, v in ipairs(clust) do
|
||||
-- Ugly database hack
|
||||
if v.loc.p == 26 then v.loc.p = 48 end -- Somehow I doubt this is the problem location, but it IS a nice place to make a translation.
|
||||
if v.loc.p == 38 then v.loc.p = 168 end -- Just following your lead.
|
||||
-- end hack
|
||||
local idx = QH_Route_Core_NodeAdd_Internal(v)
|
||||
Storage_NodeAdded(idx)
|
||||
ClusterLookup[idx] = clustid
|
||||
|
|
Référencer dans un nouveau ticket