From 5de7e94c17f9dbdb14759a33935e7c555cf6e96f Mon Sep 17 00:00:00 2001 From: Jim Whitehead Date: Sun, 19 Oct 2014 21:23:53 +0200 Subject: [PATCH] Update Astrolabe --- libs/Astrolabe/Astrolabe.lua | 26 ++++++++++++++------------ libs/Astrolabe/AstrolabeMapMonitor.lua | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libs/Astrolabe/Astrolabe.lua b/libs/Astrolabe/Astrolabe.lua index 3b09f83..bc93ff8 100755 --- a/libs/Astrolabe/Astrolabe.lua +++ b/libs/Astrolabe/Astrolabe.lua @@ -1,7 +1,7 @@ --[[ Name: Astrolabe -Revision: $Rev: 160 $ -$Date: 2012-12-09 23:33:30 +0000 (Sun, 09 Dec 2012) $ +Revision: $Rev: 161 $ +$Date: 2014-10-14 22:59:04 -0700 (Tue, 14 Oct 2014) $ Author(s): Esamynn (esamynn at wowinterface.com) Inspired By: Gatherer by Norganna MapLibrary by Kristofer Karlsson (krka at kth.se) @@ -42,7 +42,7 @@ Note: -- DO NOT MAKE CHANGES TO THIS LIBRARY WITHOUT FIRST CHANGING THE LIBRARY_VERSION_MAJOR -- STRING (to something unique) OR ELSE YOU MAY BREAK OTHER ADDONS THAT USE THIS LIBRARY!!! local LIBRARY_VERSION_MAJOR = "Astrolabe-1.0" -local LIBRARY_VERSION_MINOR = tonumber(string.match("$Revision: 160 $", "(%d+)") or 1) +local LIBRARY_VERSION_MINOR = tonumber(string.match("$Revision: 161 $", "(%d+)") or 1) if not DongleStub then error(LIBRARY_VERSION_MAJOR .. " requires DongleStub.") end if not DongleStub:IsNewerVersion(LIBRARY_VERSION_MAJOR, LIBRARY_VERSION_MINOR) then return end @@ -1248,16 +1248,18 @@ local function activate( newInstance, oldInstance ) newInstance.HarvestedMapData = { VERSION = HARVESTED_DATA_VERSION }; local HarvestedMapData = newInstance.HarvestedMapData; - newInstance.ContinentList = { GetMapContinents() }; - for C in pairs(newInstance.ContinentList) do - local zones = { GetMapZones(C) }; - newInstance.ContinentList[C] = zones; - SetMapZoom(C, 0); - zones[0] = GetCurrentMapAreaID(); + local continents = {GetMapContinents()}; + newInstance.ContinentList = {}; + for C = 1, (#continents / 2) do + local zones = {GetMapZones(C)}; + newInstance.ContinentList[C] = {}; + SetMapZoom(C); harvestMapData(HarvestedMapData); - for Z in ipairs(zones) do - SetMapZoom(C, Z); - zones[Z] = GetCurrentMapAreaID(); + local contZoneList = newInstance.ContinentList[C]; + contZoneList[0] = continents[C*2 - 1]; + for Z = 1, (#zones / 2) do + contZoneList[Z] = zones[Z*2 - 1]; + SetMapByID(contZoneList[Z]); harvestMapData(HarvestedMapData); end end diff --git a/libs/Astrolabe/AstrolabeMapMonitor.lua b/libs/Astrolabe/AstrolabeMapMonitor.lua index 58b83cc..20a6a05 100755 --- a/libs/Astrolabe/AstrolabeMapMonitor.lua +++ b/libs/Astrolabe/AstrolabeMapMonitor.lua @@ -1,7 +1,7 @@ --[[ Name: AstrolabeMapMonitor Revision: $Rev: 44 $ -$Date: 2007-03-30 19:56:21 +0100 (Fri, 30 Mar 2007) $ +$Date: 2007-03-30 11:56:21 -0700 (Fri, 30 Mar 2007) $ Author(s): Esamynn (esamynn@wowinterface.com) Inspired By: Gatherer by Norganna MapLibrary by Kristofer Karlsson (krka@kth.se) -- 1.7.9.5