WoWInterface SVN AlphaMapFansUpdate

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /branches
    from Rev 3 to Rev 4
    ↔ Reverse comparison
  •

Rev 3 → Rev 4

AlphaMapBeta/AlphaMap/AM_InstanceLocs.lua
752,14 → 752,14
["Hellfire"] = {
{
x = 0.47,
y = 0.495,
y = 0.49,
name = "|cff0F59FFHellfire Ramparts|r",
toMap = "Hellfire Ramparts",
tooltip = { " ", "L:60-62 #(5)", },
icon = "Interface\\AddOns\\AlphaMap\\Artwork\\Instance",
},
{
x = 0.45,
x = 0.44,
y = 0.524,
name = "|cff0F59FFThe Blood Furnace|r",
toMap = "The Blood Furnace",
767,7 → 767,7
icon = "Interface\\AddOns\\AlphaMap\\Artwork\\Instance",
},
{
x = 0.49,
x = 0.5,
y = 0.524,
name = "|cff0F59FFThe Shattered Halls|r",
toMap = "The Shattered Halls",
776,7 → 776,7
},
{
x = 0.47,
y = 0.548,
y = 0.553,
name = "|cffa335edMagtheridon's Lair|r",
toMap = "Magtheridon's Lair",
tooltip = { " ", "L:70+ #(25)", },
963,7 → 963,7
["SwampOfSorrows"] = {
{
x = 0.702,
y = 0.53,
y = 0.524,
name = "|c000F59FFThe Temple of Atal'Hakkar|r",
toMap = "The Temple of Atal'Hakkar",
tooltip = { " ", "L:44-60 #(5)", },
971,7 → 971,7
},
{
x = 0.702,
y = 0.557,
y = 0.559,
name = "|c0000ff00"..AM_EXTERIOR.." - The Temple of Atal'Hakkar|r",
toMap = "The Temple of Atal'Hakkar"..AM_EXTERIOR,
tooltip = { " ", "L:44-60 #(5)", },
1101,7 → 1101,7
{
x = 0.414,
y = 0.126,
name = "|c000F59FF"..AM_EXTERIOR.." - Uldaman|r",
name = "|c0000ff00"..AM_EXTERIOR.." - Uldaman|r",
toMap = "Uldaman"..AM_EXTERIOR,
tooltip = { " ", "L:35-52 #(5)", },
icon = "Interface\\AddOns\\AlphaMap\\Artwork\\Exterior",
1329,8 → 1329,8
},
["Dragonblight"] = {
{
x = 0.272,
y = 0.494,
x = 0.278,
y = 0.499,
name = "|c000F59FFAzjol-Nerub|r",
toMap = "Azjol-Nerub",
tooltip = { " ", "L:72-74 #(5)", },
1401,14 → 1401,14
},
{
x = 0.504,
y = 0.437,
y = 0.447,
name = "|cffa335edSerpentshrine Cavern|r",
toMap = "Serpentshrine Cavern",
tooltip = { " ", "L:70+ #(25)", },
icon = "Interface\\AddOns\\AlphaMap\\Artwork\\Raid",
},
{
x = 0.525,
x = 0.535,
y = 0.41,
name = "|c000F59FFThe Steamvault|r",
toMap = "The Steamvault",
1416,7 → 1416,7
icon = "Interface\\AddOns\\AlphaMap\\Artwork\\Instance",
},
{
x = 0.482,
x = 0.472,
y = 0.41,
name = "|c000F59FFThe Underbog|r",
toMap = "The Underbog",
1425,7 → 1425,7
},
{
x = 0.504,
y = 0.383,
y = 0.373,
name = "|c000F59FFThe Slave Pens|r",
toMap = "The Slave Pens",
tooltip = { " ", "L:62-64 #(5)", },
1496,8 → 1496,8
},
["Westfall"] = {
{
x = 0.428,
y = 0.766,
x = 0.43,
y = 0.78,
name = "|c000F59FFThe Deadmines|r",
toMap = "The Deadmines",
tooltip = { " ", "L:15-28 #(5)",
1505,8 → 1505,8
icon = "Interface\\AddOns\\AlphaMap\\Artwork\\Instance",
},
{
x = 0.428,
y = 0.746,
x = 0.43,
y = 0.745,
name = "|c0000ff00"..AM_EXTERIOR.." - The Deadmines|r",
toMap = "The Deadmines"..AM_EXTERIOR,
tooltip = { " ", "L:15-28 #(5)",
AlphaMapBeta/AlphaMap/AlphaMap.xml
227,16 → 227,27
</Scripts>
<HighlightTexture file="Interface\QuestFrame\UI-QuestTitleHighlight" alphaMode="ADD"/>
</Button>
<Button name="AM_GenPOIControl_Template" virtual="true" enableMouse="true">
<Button name="AM_GenPOIControl_Template" hidden="true" virtual="true" enableMouse="true" frameStrata="FULLSCREEN_DIALOG">
<Size>
<AbsDimension x="48" y="48"/>
<AbsDimension x="42" y="42"/>
</Size>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
<Layers>
<Layer level="BACKGROUND">
<Texture name="$parentTexture" file="Interface\AddOns\AlphaMap\Artwork\Instance"/>
<Layer level="ARTWORK">
<Texture name="$parentTexture" file="Interface\AddOns\AlphaMap\Artwork\Instance">
<Size>
<AbsDimension x="28" y="28"/>
</Size>
<Anchors>
<Anchor point="BOTTOMLEFT">
<Offset>
<AbsDimension x="5" y="5"/>
</Offset>
</Anchor>
</Anchors>
</Texture>
</Layer>
</Layers>
<Frames>
247,25 → 258,28
<Anchors>
<Anchor point="TOPRIGHT">
<Offset>
<AbsDimension x="1" y="-1"/>
<AbsDimension x="-4" y="-4"/>
</Offset>
</Anchor>
</Anchors>
<HitRectInsets>
<AbsInset left="21" right="0" top="0" bottom="21"/>
</HitRectInsets>
<Scripts>
<OnShow>
this:SetFrameLevel( self:GetParent():GetFrameLevel() + 2 );
</OnShow>
</Scripts>
</CheckButton>
</Frames>
<Scripts>
<OnShow>
this:SetFrameLevel( this:GetParent():GetFrameLevel() + 2 );
self:SetFrameLevel( self:GetParent():GetFrameLevel() + 2 );
</OnShow>
</Scripts>
<Backdrop bgFile="Interface\TutorialFrame\TutorialFrameBackground" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
<BackgroundInsets>
<AbsInset left="5" right="5" top="5" bottom="5"/>
</BackgroundInsets>
<TileSize>
<AbsValue val="16"/>
</TileSize>
<EdgeSize>
<AbsValue val="16"/>
</EdgeSize>
</Backdrop>
<HighlightTexture file="Interface\QuestFrame\UI-QuestTitleHighlight" alphaMode="ADD"/>
</Button>
<Frame name="AlphaMapPOITemplate" hidden="true" virtual="true" enableMouse="false">
AlphaMapBeta/AlphaMap/AlphaMap.lua
1264,10 → 1264,11
if ( mapMapper[map] ) then
return mapMapper[map].c, mapMapper[map].z;
end
 
 
return "error";
end
 
 
function AML.DisplayInstanceLocs(c, z, m, frame)
local note, noteT;
local width = frame:GetWidth();
1277,7 → 1278,7
local i = 0;
local lFloor = GetCurrentMapDungeonLevel();
 
if ( ( AM_INSTANCE_LOCS ) and ( AM_INSTANCE_LOCS[m] ) ) then
if ( ( AlphaMapConfig.iLocs ) and ( AM_INSTANCE_LOCS ) and ( AM_INSTANCE_LOCS[m] ) ) then
for _, poi in ipairs(AM_INSTANCE_LOCS[m]) do
if ( ( not poi.floor ) or ( poi.floor == lFloor ) ) then
i = i + 1;
1887,6 → 1888,10
AlphaMapConfig.mute = false;
end
 
if ( AlphaMapConfig.iLocs == nil ) then
AlphaMapConfig.iLocs = true;
end
 
if ( AlphaMapConfig.coords == nil ) then
AlphaMapConfig.coords = true;
end
2013,7 → 2018,43
AM_SaveGlobals();
----------------------------------------------------------------------------------------------------------
 
local i = #(AML.CustomPOIControls) + 1;
local controlButton = CreateFrame("Button", "AM_POIC"..i, AlphaMapDetailFrame, "AM_GenPOIControl_Template");
controlButton.id = i;
local controlButtonT = getglobal("AM_POIC"..i.."Texture");
controlButtonT:SetTexture("Interface\\AddOns\\AlphaMap\\Artwork\\Raid");
local controlButtonC = getglobal("AM_POIC"..i.."Check");
controlButtonC:SetScript("OnShow", function(self)
self:SetFrameLevel( self:GetParent():GetFrameLevel() + 3 );
if ( AlphaMapConfig.iLocs ) then
self:SetChecked(1);
else
self:SetChecked(0);
end
end)
controlButtonC:SetScript("OnClick", function(self)
if ( self:GetChecked() ) then
PlaySound("igMainMenuOptionCheckBoxOff");
AlphaMapConfig.iLocs = false;
self:SetChecked(0);
 
else
PlaySound("igMainMenuOptionCheckBoxOn");
AlphaMapConfig.iLocs = true;
self:SetChecked(1);
end
AM_SaveGlobals();
AlphaMapUnits_Update(1);
end)
controlButton:SetScript("OnClick", function(self)
local v = getglobal(self:GetName() .. "Check");
if ( v ) then
self = v;
v = v:GetScript("OnClick");
if ( v ) then v(self); end
end
end)
table.insert(AML.CustomPOIControls, controlButton);
 
if ( AlphaMapConfig.gmap == true ) then
AM_SetupGameMap();
2430,7 → 2471,6
if ( ddI ) then
UIDropDownMenu_SetSelectedID(AlphaMapContinentDropDown, ddI);
UIDropDownMenu_SetText( AlphaMapContinentDropDown, amMapType );
NuN_Message(amAlphaMapMap.displayname)
ddI = AML.AM_GetMapIndex(amAlphaMapMap.displayname);
if ( ddI ) then
AML.SetupZoneDropDown()
3212,26 → 3252,6
-- Unit Updates / Icon Updates
function AlphaMapUnits_Update(tim)
 
--*** if ( AlphaMapAlphaMapFrame:IsVisible() ) then
--*** local ddStatus = UIDropDownMenu_GetText( AlphaMapZoneDropDown );
--*** if ( ( not ddStatus ) or ( ddStatus == "" ) ) then
--*** UIDropDownMenu_ClearAll(AlphaMapContinentDropDown);
--*** UIDropDownMenu_ClearAll(AlphaMapZoneDropDown);
--*** local ddI = AML.AM_GetTypeIndex(amContType);
--*** if ( ddI ) then
--*** UIDropDownMenu_SetSelectedID(AlphaMapContinentDropDown, ddI);
--*** UIDropDownMenu_SetText( AlphaMapContinentDropDown, amMapType );
--*** AML.AM_LoadSortedMapList(amContType);
--*** ddI = AML.AM_GetMapIndex(amAlphaMapMap.displayname);
--*** if ( ddI ) then
--*** AlphaMapFrame_LoadInstances();
--*** UIDropDownMenu_SetSelectedID(AlphaMapZoneDropDown, ddI);
--*** UIDropDownMenu_SetText( AlphaMapZoneDropDown, amAlphaMapMap.displayname );
--*** end
--*** end
--*** end
--*** end
 
if ( AlphaMapFrame.isMoving ) then
return;
end
4725,6 → 4745,7
AlphaMapConfig.mute = false;
AlphaMapConfig.coords = true;
AlphaMapConfig.hTips = true;
AlphaMapConfig.iLocs = true;
 
AlphaMapConfig.sliderLocX = AM_DefaultSliderX;
AlphaMapConfig.sliderLocY = AM_DefaultSliderY;
7619,6 → 7640,8
 
AlphaMapConfigurations[ configuration ].hTips = AlphaMapConfig.hTips;
 
AlphaMapConfigurations[ configuration ].iLocs = AlphaMapConfig.iLocs;
 
end
end
 
8026,6 → 8049,41
end
end
 
 
if ( ( IsControlKeyDown() ) and ( IsAltKeyDown() ) and ( not AlphaMapAlphaMapFrame:IsVisible() )
and ( not AML.controlsVisible ) ) then
local b, controls = 1, #(AML.CustomPOIControls);
local xO = ( controls - 1 ) * 22;
local control, prevC = AML.CustomPOIControls[b];
local amUnitScale = AlphaMap_GetUnitScale(0.9, 1.1);
if ( control ) then
control:ClearAllPoints();
control:SetScale( amUnitScale );
control:SetPoint("CENTER", "AlphaMapDetailFrame", "CENTER", -xO/amUnitScale, 0);
control:Show();
prevC = control;
b = b + 1;
control = AML.CustomPOIControls[b];
while ( control ) do
control:ClearAllPoints();
control:SetScale( amUnitScale );
control:SetPoint("LEFT", prevC:GetName(), "RIGHT", 1/amUnitScale, 0);
control:Show();
prevC = control;
b = b + 1;
control = AML.CustomPOIControls[b];
end
end
AML.controlsVisible = true;
 
elseif ( ( ( not IsControlKeyDown() ) or ( not IsAltKeyDown() ) or ( AlphaMapAlphaMapFrame:IsVisible() ) )
and ( AlphaMapMovementFrameTop:IsVisible() ) ) then
for _, control in ipairs(AML.CustomPOIControls) do
control:Hide();
end
AML.controlsVisible = false;
end
 
if ( ( IsControlKeyDown() ) and ( IsAltKeyDown() ) and ( not AlphaMapMovementFrameTop:IsVisible() ) ) then
AlphaMapMovementFrameTop:Show();
AlphaMapMovementFrameBottom:Show();
AlphaMapBeta/AlphaMap_Instances/localisation.en.lua
2757,6 → 2757,7
displayname = "CoT: The Culling of Stratholme",
displayshort = "CoT4",
continent = 1,
toMap = "Caverns of Time"..AM_EXTERIOR,
toWorldMap = "Tanaris",
filename = "Interface\\AddOns\\AlphaMap_Instances\\Maps\\Oldstrat", -- Oldstratholme
location = "Caverns of Time",