Skip to content

Commit

Permalink
Build 8089
Browse files Browse the repository at this point in the history
  • Loading branch information
@tekkub
tekkub committed Apr 1, 2008
1 parent 4be024f commit 44256bf
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 39 deletions.
12 changes: 7 additions & 5 deletions AddOns/Blizzard_CombatLog/Blizzard_CombatLog.lua
View file
Expand Up @@ -14,7 +14,7 @@
-- Version
-- Constant -- Incrementing this number will erase saved filter settings!!
COMBATLOG_FILTER_VERSION = 3;
COMBATLOG_FILTER_VERSION = 4;
-- Saved Variable
Blizzard_CombatLog_Filter_Version = 0;
Expand Down Expand Up @@ -102,6 +102,8 @@ COMBATLOG_DEFAULT_SETTINGS = {
showHistory = true;
lineColorPriority = 1; -- 1 = source->dest->event, 2 = dest->source->event, 3 = event->source->dest
unitIcons = true;
hideBuffs = false;
hideDebuffs = false;
--unitTokens = true;
};
Expand Down Expand Up @@ -427,10 +429,10 @@ Blizzard_CombatLog_Filter_Defaults = {
["SPELL_EXTRA_ATTACKS"] = true,
--["SPELL_DURABILITY_DAMAGE"] = true,
--["SPELL_DURABILITY_DAMAGE_ALL"] = true,
--["SPELL_AURA_APPLIED"] = true,
--["SPELL_AURA_APPLIED_DOSE"] = true,
--["SPELL_AURA_REMOVED"] = true,
--["SPELL_AURA_REMOVED_DOSE"] = true,
["SPELL_AURA_APPLIED"] = true,
["SPELL_AURA_APPLIED_DOSE"] = true,
["SPELL_AURA_REMOVED"] = true,
["SPELL_AURA_REMOVED_DOSE"] = true,
["SPELL_AURA_DISPELLED"] = true,
["SPELL_AURA_STOLEN"] = true,
["ENCHANT_APPLIED"] = true,
Expand Down
6 changes: 3 additions & 3 deletions AddOns/Blizzard_MacroUI/Blizzard_MacroUI.xml
View file
Expand Up @@ -132,7 +132,7 @@
</Anchor>
</Anchors>
</Texture>
<FontString name="MacroFrameSelectedMacroName" inherits="GameFontNormalLarge" justifyH="LEFT">
<FontString name="MacroFrameSelectedMacroName" frameStrata="HIGH" inherits="GameFontNormalLarge" justifyH="LEFT">
<Size>
<AbsDimension x="256" y="16"/>
</Size>
Expand Down Expand Up @@ -165,7 +165,7 @@
</Layer>
</Layers>
<Frames>
<CheckButton name="MacroFrameSelectedMacroButton" inherits="MacroButtonTemplate" id="0">
<CheckButton name="MacroFrameSelectedMacroButton" frameStrata="HIGH" inherits="MacroButtonTemplate" id="0">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="MacroFrameSelectedMacroBackground">
<Offset>
Expand Down Expand Up @@ -342,7 +342,7 @@
</Anchor>
</Anchors>
</CheckButton>
<Button name="MacroEditButton" inherits="UIPanelButtonTemplate" text="CHANGE_MACRO_NAME_ICON">
<Button name="MacroEditButton" frameStrata="HIGH" inherits="UIPanelButtonTemplate" text="CHANGE_MACRO_NAME_ICON">
<Size>
<AbsDimension x="170" y="22"/>
</Size>
Expand Down
36 changes: 24 additions & 12 deletions FrameXML/ChatConfigFrame.lua
View file
Expand Up @@ -384,15 +384,15 @@ COMBAT_CONFIG_MESSAGETYPES_LEFT = {
[1] = {
text = BENEFICIAL,
type = {"SPELL_AURA_APPLIED", "SPELL_AURA_APPLIED_DOSE", "SPELL_AURA_APPLIED_REMOVED", "SPELL_AURA_APPLIED_REMOVED_DOSE"};
checked = function () return not CHATCONFIG_SELECTED_FILTER_FILTERS[1].hideBuffs end;
checked = function () return not CHATCONFIG_SELECTED_FILTER_SETTINGS.hideBuffs end;
func = function (checked)
if ( checked ) then
CHATCONFIG_SELECTED_FILTER_FILTERS[1].hideBuffs = false;
CHATCONFIG_SELECTED_FILTER_SETTINGS.hideBuffs = false;
ToggleMessageType(checked, "SPELL_AURA_APPLIED", "SPELL_AURA_APPLIED_DOSE", "SPELL_AURA_APPLIED_REMOVED", "SPELL_AURA_APPLIED_REMOVED_DOSE");
else
CHATCONFIG_SELECTED_FILTER_FILTERS[1].hideBuffs = true;
CHATCONFIG_SELECTED_FILTER_SETTINGS.hideBuffs = true;
-- Only stop listening for the messages if hideDebuffs is also true
if ( CHATCONFIG_SELECTED_FILTER_FILTERS[1].hideDebuffs ) then
if ( CHATCONFIG_SELECTED_FILTER_SETTINGS.hideDebuffs ) then
ToggleMessageType(checked, "SPELL_AURA_APPLIED", "SPELL_AURA_APPLIED_DOSE", "SPELL_AURA_APPLIED_REMOVED", "SPELL_AURA_APPLIED_REMOVED_DOSE");
end
end
Expand All @@ -402,15 +402,15 @@ COMBAT_CONFIG_MESSAGETYPES_LEFT = {
[2] = {
text = HOSTILE,
type = {"SPELL_AURA_APPLIED", "SPELL_AURA_APPLIED_DOSE", "SPELL_AURA_APPLIED_REMOVED", "SPELL_AURA_APPLIED_REMOVED_DOSE"};
checked = function () return not CHATCONFIG_SELECTED_FILTER_FILTERS[1].hideDebuffs end;
checked = function () return not CHATCONFIG_SELECTED_FILTER_SETTINGS.hideDebuffs end;
func = function (checked)
if ( checked ) then
CHATCONFIG_SELECTED_FILTER_FILTERS[1].hideDebuffs = false;
CHATCONFIG_SELECTED_FILTER_SETTINGS.hideDebuffs = false;
ToggleMessageType(checked, "SPELL_AURA_APPLIED", "SPELL_AURA_APPLIED_DOSE", "SPELL_AURA_APPLIED_REMOVED", "SPELL_AURA_APPLIED_REMOVED_DOSE");
else
CHATCONFIG_SELECTED_FILTER_FILTERS[1].hideDebuffs = true;
CHATCONFIG_SELECTED_FILTER_SETTINGS.hideDebuffs = true;
-- Only stop listening for the messages if hideDebuffs is also true
if ( CHATCONFIG_SELECTED_FILTER_FILTERS[1].hideBuffs ) then
if ( CHATCONFIG_SELECTED_FILTER_SETTINGS.hideBuffs ) then
ToggleMessageType(checked, "SPELL_AURA_APPLIED", "SPELL_AURA_APPLIED_DOSE", "SPELL_AURA_APPLIED_REMOVED", "SPELL_AURA_APPLIED_REMOVED_DOSE");
end
end
Expand Down Expand Up @@ -1011,11 +1011,11 @@ function CombatConfig_Colorize_Update()
CombatConfigColorsHighlightingSchool:SetChecked(CHATCONFIG_SELECTED_FILTER_SETTINGS.schoolNameHighlighting);


local text, r, g, b = CombatLog_OnEvent(CHATCONFIG_SELECTED_FILTER, 0, "SPELL_DAMAGE", 0x0000000000000001, UNIT_YOU_DEST_POSSESSIVE, 0x511, 0xF13000012B000820, EXAMPLE_TARGET_MONSTER, 0x10a28 ,116, EXAMPLE_SPELL_FROSTBOLT, SCHOOL_MASK_FROST, 27, SCHOOL_MASK_FROST, nil, nil, nil, 1, nil, nil);
local text, r, g, b = CombatLog_OnEvent(CHATCONFIG_SELECTED_FILTER, 0, "SPELL_DAMAGE", 0x0000000000000001, UnitName("player"), 0x511, 0xF13000012B000820, EXAMPLE_TARGET_MONSTER, 0x10a28 ,116, EXAMPLE_SPELL_FROSTBOLT, SCHOOL_MASK_FROST, 27, SCHOOL_MASK_FROST, nil, nil, nil, 1, nil, nil);
CombatConfigColorsExampleString1:SetVertexColor(r, g, b);
CombatConfigColorsExampleString1:SetText(text);

text, r, g, b = CombatLog_OnEvent(CHATCONFIG_SELECTED_FILTER, 0, "SPELL_DAMAGE", 0xF13000024D002914, EXAMPLE_TARGET_MONSTER, 0x10a48, 0x0000000000000001, UNIT_YOU_DEST, 0x511, 20793,EXAMPLE_SPELL_FIREBALL, SCHOOL_MASK_FIRE, 68, SCHOOL_MASK_FIRE, nil, nil, nil, nil, nil, nil);
text, r, g, b = CombatLog_OnEvent(CHATCONFIG_SELECTED_FILTER, 0, "SPELL_DAMAGE", 0xF13000024D002914, EXAMPLE_TARGET_MONSTER, 0x10a48, 0x0000000000000001, UnitName("player"), 0x511, 20793,EXAMPLE_SPELL_FIREBALL, SCHOOL_MASK_FIRE, 68, SCHOOL_MASK_FIRE, nil, nil, nil, nil, nil, nil);
CombatConfigColorsExampleString2:SetVertexColor(r, g, b);
CombatConfigColorsExampleString2:SetText(text);
end
Expand All @@ -1037,11 +1037,11 @@ function CombatConfig_Formatting_Update()
CombatConfigFormattingItemNames:SetChecked(CHATCONFIG_SELECTED_FILTER_SETTINGS.itemBraces);
CombatConfigFormattingFullText:SetChecked(CHATCONFIG_SELECTED_FILTER_SETTINGS.fullText);

local text, r, g, b = CombatLog_OnEvent(CHATCONFIG_SELECTED_FILTER, 0, "SPELL_DAMAGE", 0x0000000000000001, "Player", 0x511, 0xF13000012B000820, EXAMPLE_TARGET_MONSTER, 0x10a28 ,116, EXAMPLE_SPELL_FROSTBOLT, SCHOOL_MASK_FROST, 27, SCHOOL_MASK_FROST, nil, nil, nil, 1, nil, nil);
local text, r, g, b = CombatLog_OnEvent(CHATCONFIG_SELECTED_FILTER, 0, "SPELL_DAMAGE", 0x0000000000000001, UnitName("player"), 0x511, 0xF13000012B000820, EXAMPLE_TARGET_MONSTER, 0x10a28 ,116, EXAMPLE_SPELL_FROSTBOLT, SCHOOL_MASK_FROST, 27, SCHOOL_MASK_FROST, nil, nil, nil, 1, nil, nil);
CombatConfigFormattingExampleString1:SetVertexColor(r, g, b);
CombatConfigFormattingExampleString1:SetText(text);

text, r, g, b = CombatLog_OnEvent(CHATCONFIG_SELECTED_FILTER, 0, "SPELL_DAMAGE", 0xF13000024D002914, EXAMPLE_TARGET_MONSTER, 0x10a48, 0x0000000000000001, "Player", 0x511, 20793,EXAMPLE_SPELL_FIREBALL, SCHOOL_MASK_FIRE, 68, SCHOOL_MASK_FIRE, nil, nil, nil, nil, nil, nil);
text, r, g, b = CombatLog_OnEvent(CHATCONFIG_SELECTED_FILTER, 0, "SPELL_DAMAGE", 0xF13000024D002914, EXAMPLE_TARGET_MONSTER, 0x10a48, 0x0000000000000001, UnitName("player"), 0x511, 20793,EXAMPLE_SPELL_FIREBALL, SCHOOL_MASK_FIRE, 68, SCHOOL_MASK_FIRE, nil, nil, nil, nil, nil, nil);
CombatConfigFormattingExampleString2:SetVertexColor(r, g, b);
CombatConfigFormattingExampleString2:SetText(text);
end
Expand Down Expand Up @@ -1481,6 +1481,9 @@ function ChatConfig_UpdateCombatSettings()
getglobal(value.frame):Hide();
end
return;
elseif ( #Blizzard_CombatLog_Filters.filters == 1 ) then
-- Don't allow them to delete the last filter for now
ChatConfigCombatSettingsFiltersDeleteButton:Disable();
else
ChatConfigCombatSettingsFiltersCopyFilterButton:Enable();
ChatConfigCombatSettingsFiltersDeleteButton:Enable();
Expand Down Expand Up @@ -1659,7 +1662,16 @@ function CombatConfig_CreateCombatFilter(name, filter)
end

function CombatConfig_DeleteCurrentCombatFilter()
-- Don't allow deletion of all filters
if ( #Blizzard_CombatLog_Filters.filters <= 1 ) then
return;
end
tremove(Blizzard_CombatLog_Filters.filters, ChatConfigCombatSettingsFilters.selectedFilter);
-- If the deleted filter is the selected filter, then select a new filter if possible
if ( ChatConfigCombatSettingsFilters.selectedFilter == Blizzard_CombatLog_Filters.currentFilter ) then
Blizzard_CombatLog_QuickButton_OnClick(1);
end

-- Scroll filters to top of list
ChatConfigCombatSettingsFiltersScrollFrameScrollBar:SetValue(0);
-- Select the first filter
Expand Down
28 changes: 9 additions & 19 deletions FrameXML/UIOptionsPanels.xml
View file
Expand Up @@ -634,16 +634,13 @@
self.Disable = function (self) self:oldDisable() getglobal(self:GetName().."Text"):SetTextColor(GRAY_FONT_COLOR.r, GRAY_FONT_COLOR.g, GRAY_FONT_COLOR.b) end;
self.Enable = function (self) self:oldEnable() getglobal(self:GetName().."Text"):SetTextColor(HIGHLIGHT_FONT_COLOR.r, HIGHLIGHT_FONT_COLOR.g, HIGHLIGHT_FONT_COLOR.b) end;
self.GetValue = function (self) return ( ShowingCloak() ); end
self.SetValue = function (self, value) if ( self:IsEnabled() == 1 ) then self:SetChecked(value); self:Disable(); InterfaceOptionsDisplayPanelShowHelm:Disable(); self:RegisterEvent("PLAYER_FLAGS_CHANGED"); ShowCloak(value); end end
self.SetValue = function (self, value) self:SetChecked(value); ShowCloak(value); end
self:RegisterEvent("PLAYER_FLAGS_CHANGED");
</OnLoad>
<OnShow>
self:SetChecked(ShowingCloak());
</OnShow>
<OnClick>
self:Disable();
InterfaceOptionsDisplayPanelShowHelm:Disable();
self:RegisterEvent("PLAYER_FLAGS_CHANGED");

<OnClick>
if ( this:GetChecked() ) then
PlaySound("igMainMenuOptionCheckBoxOn");
ShowCloak(true);
Expand All @@ -653,10 +650,8 @@
end
</OnClick>
<OnEvent>
if ( event == "PLAYER_FLAGS_CHANGED" and arg1 == "player" ) then
self:Enable()
InterfaceOptionsDisplayPanelShowHelm:Enable();
self:UnregisterEvent("PLAYER_FLAGS_CHANGED");
if ( arg1 == "player" ) then
self:SetChecked(ShowingCloak());
end
</OnEvent>
</Scripts>
Expand All @@ -682,16 +677,13 @@
self.Disable = function (self) self:oldDisable() getglobal(self:GetName().."Text"):SetTextColor(GRAY_FONT_COLOR.r, GRAY_FONT_COLOR.g, GRAY_FONT_COLOR.b) end;
self.Enable = function (self) self:oldEnable() getglobal(self:GetName().."Text"):SetTextColor(HIGHLIGHT_FONT_COLOR.r, HIGHLIGHT_FONT_COLOR.g, HIGHLIGHT_FONT_COLOR.b) end;
self.GetValue = function (self) return ( ShowingHelm() ); end
self.SetValue = function (self, value) if ( self:IsEnabled() == 1 ) then self:SetChecked(value); self:Disable(); InterfaceOptionsDisplayPanelShowCloak:Disable(); self:RegisterEvent("PLAYER_FLAGS_CHANGED"); ShowHelm(value); end end
self.SetValue = function (self, value) self:SetChecked(value); ShowHelm(value); end
self:RegisterEvent("PLAYER_FLAGS_CHANGED");
</OnLoad>
<OnShow>
self:SetChecked(ShowingHelm());
</OnShow>
<OnClick>
self:Disable();
InterfaceOptionsDisplayPanelShowCloak:Disable();
self:RegisterEvent("PLAYER_FLAGS_CHANGED");

if ( this:GetChecked() ) then
PlaySound("igMainMenuOptionCheckBoxOn");
ShowHelm(true);
Expand All @@ -701,10 +693,8 @@
end
</OnClick>
<OnEvent>
if ( event == "PLAYER_FLAGS_CHANGED" and arg1 == "player" ) then
self:Enable()
InterfaceOptionsDisplayPanelShowCloak:Enable();
self:UnregisterEvent("PLAYER_FLAGS_CHANGED");
if ( arg1 == "player" ) then
self:SetChecked(ShowingHelm());
end
</OnEvent>
</Scripts>
Expand Down

0 comments on commit 44256bf

Please sign in to comment.