WoWInterface SVN MyThreat

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk/MyThreat
    from Rev 26 to Rev 25
    ↔ Reverse comparison
  •

Rev 26 → Rev 25

MyThreat.lua
60,18 → 60,15
MyThreat.db.profile.red.relative = v;
end,
},
alpha = {
type = 'range',
name = 'Alpha',
desc = 'The alpha level of the MyThreat frame in this threat range.',
min = 0,
max = 1,
step = 0.05,
hidden = {
type = 'toggle',
name = 'Hidden',
desc = 'Hide the MyThreat frame when threat is in this range.',
get = function()
return MyThreat.db.profile.red.alpha;
return MyThreat.db.profile.red.hidden;
end,
set = function(_, v)
MyThreat.db.profile.red.alpha = v;
set = function()
MyThreat.db.profile.red.hidden = not MyThreat.db.profile.red.hidden;
end;
},
},
111,18 → 108,15
MyThreat.db.profile.orange.relative = v;
end,
},
alpha = {
type = 'range',
name = 'Alpha',
desc = 'The alpha level of the MyThreat frame in this threat range.',
min = 0,
max = 1,
step = 0.05,
hidden = {
type = 'toggle',
name = 'Hidden',
desc = 'Hide the MyThreat frame when threat is in this range.',
get = function()
return MyThreat.db.profile.orange.alpha;
return MyThreat.db.profile.orange.hidden;
end,
set = function(_, v)
MyThreat.db.profile.orange.alpha = v;
set = function()
MyThreat.db.profile.orange.hidden = not MyThreat.db.profile.orange.hidden;
end;
},
},
162,18 → 156,15
MyThreat.db.profile.yellow.relative = v;
end,
},
alpha = {
type = 'range',
name = 'Alpha',
desc = 'The alpha level of the MyThreat frame in this threat range.',
min = 0,
max = 1,
step = 0.05,
hidden = {
type = 'toggle',
name = 'Hidden',
desc = 'Hide the MyThreat frame when threat is in this range.',
get = function()
return MyThreat.db.profile.yellow.alpha;
return MyThreat.db.profile.yellow.hidden;
end,
set = function(_, v)
MyThreat.db.profile.yellow.alpha = v;
set = function()
MyThreat.db.profile.yellow.hidden = not MyThreat.db.profile.yellow.hidden;
end;
},
},
228,20 → 219,17
MyThreat:Process();
end;
},
alpha = {
type = 'range',
name = 'Alpha',
desc = 'The alpha level of the MyThreat frame when it is in the safe range.',
min = 0,
max = 1,
step = 0.05,
get = function()
return MyThreat.db.profile.safeAlpha;
end,
set = function(_, v)
MyThreat.db.profile.safeAlpha = v;
end;
},
hideSafe = {
type = 'toggle',
name = 'Hide when safe',
desc = 'Hide the MyThreat frame when threat is not in a critical range.',
get = function()
return MyThreat.db.profile.hiddeWhenSafe;
end,
set = function()
MyThreat.db.profile.hiddeWhenSafe = not MyThreat.db.profile.hiddeWhenSafe;
end;
},
focus = {
type = 'group',
name = 'Focus',
333,21 → 321,21
red = {
relative = .95,
absolute = 1000,
alpha = 1,
hidden = false,
},
orange = {
relative = .90,
absolute = 2500,
alpha = 1,
hidden = false,
},
yellow = {
relative = .85,
absolute = 5000,
alpha = 1,
hidden = false,
},
fontSize = 16,
tankMode = false,
safeAlpha = 1,
hideWhenSafe = false,
autoAdjust = true,
}
});
731,7 → 719,7
local r = 0;
local g = 1;
local b = 0;
local a = MyThreat.db.profile.safeAlpha;
local hidden = MyThreat.db.profile.hideWhenSafe;
 
-- set the text for absolute threat diff
if (threatDiff >= 1000 or threatDiff <= -1000) then
759,36 → 747,47
if (threatDiff <= MyThreat.db.profile.red.absolute or threatDiffPercent >= MyThreat.db.profile.red.relative) then
r = 1;
g = 0;
a = MyThreat.db.profile.red.alpha;
hidden = MyThreat.db.profile.red.hidden;
elseif (threatDiff <= MyThreat.db.profile.orange.absolute or threatDiffPercent >= MyThreat.db.profile.orange.relative) then
r = 1;
g = 0.5;
a = MyThreat.db.profile.orange.alpha;
hidden = MyThreat.db.profile.orange.hidden;
elseif (threatDiff <= MyThreat.db.profile.yellow.absolute or threatDiffPercent >= MyThreat.db.profile.yellow.relative) then
r = 1;
g = 1;
a = MyThreat.db.profile.yellow.alpha;
hidden = MyThreat.db.profile.yellow.hidden;
end
 
end
 
-- adjust labels
MyThreat_ThreatFrameThreatDiff:SetText(threatText);
MyThreat_ThreatFrameThreatPercDiff:SetText(relativeThreatText);
if (not hidden) then
-- show labels if hidden
if (not MyThreat_ThreatFrameThreatDiff:IsVisible()) then
 
MyThreat_ThreatFrameThreatDiff:Show();
MyThreat_ThreatFrameThreatPercDiff:Show();
MyThreat_ThreatFrameThreatPlayerName:Show();
 
end
 
-- adjust labels
MyThreat_ThreatFrameThreatDiff:SetText(threatText);
MyThreat_ThreatFrameThreatPercDiff:SetText(relativeThreatText);
 
MyThreat_ThreatFrameThreatDiff:SetTextColor(r,g,b);
MyThreat_ThreatFrameThreatPercDiff:SetTextColor(r,g,b);
MyThreat_ThreatFrameThreatPlayerName:SetTextColor(r,g,b);
 
MyThreat_ThreatFrameThreatPlayerName:SetText(tankName);
else
-- hide bars if visible
if (MyThreat_ThreatFrameThreatDiff:IsVisible()) then
 
MyThreat_ThreatFrameThreatDiff:SetTextColor(r,g,b,a);
MyThreat_ThreatFrameThreatPercDiff:SetTextColor(r,g,b,a);
MyThreat_ThreatFrameThreatPlayerName:SetTextColor(r,g,b,a);
 
MyThreat_ThreatFrameThreatPlayerName:SetText(tankName);
 
-- show labels if hidden
if (not MyThreat_ThreatFrameThreatDiff:IsVisible()) then
 
MyThreat_ThreatFrameThreatDiff:Show();
MyThreat_ThreatFrameThreatPercDiff:Show();
MyThreat_ThreatFrameThreatPlayerName:Show();
 
MyThreat_ThreatFrameThreatDiff:Hide();
MyThreat_ThreatFrameThreatPercDiff:Hide();
MyThreat_ThreatFrameThreatPlayerName:Hide();
 
end
end
 
else