- Improved aura creation.
- Custom display 'My Spells' now also show your pets. - Fixed 'Raid Check' plugin food detection.
This commit is contained in:
Tercio
@@ -12,4 +12,5 @@ move-folders:
|
||||
Details/plugins/Details_DataStorage: Details_DataStorage
|
||||
Details/plugins/Details_DungeonInfo-Warlords: Details_DungeonInfo-Warlords
|
||||
Details/plugins/Details_3DModelsPaths: Details_3DModelsPaths
|
||||
Details/plugins/Details_RaidCheck: Details_RaidCheck
|
||||
Details/plugins/Details_RaidCheck: Details_RaidCheck
|
||||
Details/plugins/Details_DpsTuning: Details_DpsTuning
|
||||
+62
-31
@@ -740,8 +740,8 @@
|
||||
return actor_table.value
|
||||
end
|
||||
|
||||
function atributo_custom:AddValue (actor, actortotal, checktop)
|
||||
local actor_table = self:GetActorTable (actor)
|
||||
function atributo_custom:AddValue (actor, actortotal, checktop, name_complement)
|
||||
local actor_table = self:GetActorTable (actor, name_complement)
|
||||
actor_table.my_actor = actor
|
||||
actor_table.value = actor_table.value + actortotal
|
||||
|
||||
@@ -754,8 +754,8 @@
|
||||
return actor_table.value
|
||||
end
|
||||
|
||||
function atributo_custom:SetValue (actor, actortotal)
|
||||
local actor_table = self:GetActorTable (actor)
|
||||
function atributo_custom:SetValue (actor, actortotal, name_complement)
|
||||
local actor_table = self:GetActorTable (actor, name_complement)
|
||||
actor_table.my_actor = actor
|
||||
actor_table.value = actortotal
|
||||
end
|
||||
@@ -764,7 +764,7 @@
|
||||
actors.new_actor.classe = actors.actor.classe
|
||||
end
|
||||
|
||||
function atributo_custom:GetActorTable (actor)
|
||||
function atributo_custom:GetActorTable (actor, name_complement)
|
||||
local index = self._NameIndexTable [actor.nome]
|
||||
|
||||
if (index) then
|
||||
@@ -783,7 +783,8 @@
|
||||
value = _detalhes:GetOrderNumber (actor.nome),
|
||||
}, atributo_custom.mt)
|
||||
|
||||
new_actor.displayName = new_actor.nome
|
||||
new_actor.name_complement = name_complement
|
||||
new_actor.displayName = new_actor.nome .. (name_complement or "")
|
||||
new_actor.spec = actor.spec
|
||||
|
||||
if (actor.id) then
|
||||
@@ -1347,7 +1348,7 @@
|
||||
total_script = false,
|
||||
script_version = 9,
|
||||
}
|
||||
-- /run_detalhes:AddDefaultCustomDisplays()
|
||||
-- /run _detalhes:AddDefaultCustomDisplays()
|
||||
local have = false
|
||||
for _, custom in ipairs (self.custom) do
|
||||
if (custom.name == Loc ["STRING_CUSTOM_HEALTHSTONE_DEFAULT"] and (custom.script_version and custom.script_version >= Healthstone.script_version) ) then
|
||||
@@ -1507,7 +1508,7 @@
|
||||
desc = Loc ["STRING_CUSTOM_DTBS_DESC"],
|
||||
source = false,
|
||||
target = false,
|
||||
script_version = 20,
|
||||
script_version = 22,
|
||||
on_shift_click = [[
|
||||
local row, object, instance = ...
|
||||
local spellname, _, spellicon = _detalhes.GetSpellInfo (object.id)
|
||||
@@ -1649,11 +1650,14 @@
|
||||
end
|
||||
end
|
||||
|
||||
local aura = ""
|
||||
if (WeakAuras) then
|
||||
GameCooltip:AddLine (" ")
|
||||
GameCooltip:AddLine ("Shift Click: Create WeakAura")
|
||||
GameCooltip:AddStatusBar (100, 1, 0, 0, 0, 0.6, true, bar_background)
|
||||
aura = "|cFFffa200Shift Click|r: Create Aura"
|
||||
end
|
||||
|
||||
GameCooltip:AddLine (" ")
|
||||
GameCooltip:AddLine ("|cFFffa200Click|r: Report Results", aura, 1, "white", "white")
|
||||
GameCooltip:AddStatusBar (100, 1, 0, 0, 0, 0.6, false, bar_background)
|
||||
]],
|
||||
}
|
||||
|
||||
@@ -1665,14 +1669,20 @@
|
||||
end
|
||||
end
|
||||
if (not have) then
|
||||
setmetatable (DamageTakenBySpell, _detalhes.atributo_custom)
|
||||
DamageTakenBySpell.__index = _detalhes.atributo_custom
|
||||
|
||||
for i, custom in ipairs (self.custom) do
|
||||
if (custom.name == Loc ["STRING_CUSTOM_DTBS"]) then
|
||||
table.remove (self.custom, i)
|
||||
tinsert (self.custom, i, DamageTakenBySpell)
|
||||
have = true
|
||||
end
|
||||
end
|
||||
setmetatable (DamageTakenBySpell, _detalhes.atributo_custom)
|
||||
DamageTakenBySpell.__index = _detalhes.atributo_custom
|
||||
self.custom [#self.custom+1] = DamageTakenBySpell
|
||||
|
||||
if (not have) then
|
||||
self.custom [#self.custom+1] = DamageTakenBySpell
|
||||
end
|
||||
end
|
||||
|
||||
----------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
@@ -1686,7 +1696,7 @@
|
||||
desc = Loc ["STRING_CUSTOM_MYSPELLS_DESC"],
|
||||
source = false,
|
||||
target = false,
|
||||
script_version = 2,
|
||||
script_version = 4,
|
||||
script = [[
|
||||
--get the parameters passed
|
||||
local combat, instance_container, instance = ...
|
||||
@@ -1695,31 +1705,47 @@
|
||||
|
||||
local player
|
||||
local role = UnitGroupRolesAssigned ("player")
|
||||
local pet_attribute
|
||||
|
||||
if (role == "DAMAGER") then
|
||||
player = combat (DETAILS_ATTRIBUTE_DAMAGE, _detalhes.playername)
|
||||
player = combat (DETAILS_ATTRIBUTE_DAMAGE, _detalhes.playername)
|
||||
pet_attribute = DETAILS_ATTRIBUTE_DAMAGE
|
||||
elseif (role == "HEALER") then
|
||||
player = combat (DETAILS_ATTRIBUTE_HEAL, _detalhes.playername)
|
||||
player = combat (DETAILS_ATTRIBUTE_HEAL, _detalhes.playername)
|
||||
pet_attribute = DETAILS_ATTRIBUTE_HEAL
|
||||
else
|
||||
player = combat (DETAILS_ATTRIBUTE_DAMAGE, _detalhes.playername)
|
||||
player = combat (DETAILS_ATTRIBUTE_DAMAGE, _detalhes.playername)
|
||||
pet_attribute = DETAILS_ATTRIBUTE_DAMAGE
|
||||
end
|
||||
|
||||
--do the loop
|
||||
|
||||
if (player) then
|
||||
local spells = player:GetSpellList()
|
||||
for spellid, spell in pairs (spells) do
|
||||
instance_container:AddValue (spell, spell.total)
|
||||
total = total + spell.total
|
||||
if (top < spell.total) then
|
||||
top = spell.total
|
||||
local spells = player:GetSpellList()
|
||||
for spellid, spell in pairs (spells) do
|
||||
instance_container:AddValue (spell, spell.total)
|
||||
total = total + spell.total
|
||||
if (top < spell.total) then
|
||||
top = spell.total
|
||||
end
|
||||
amount = amount + 1
|
||||
end
|
||||
|
||||
for _, PetName in ipairs (player.pets) do
|
||||
local pet = combat (pet_attribute, PetName)
|
||||
if (pet) then
|
||||
for spellid, spell in pairs (pet:GetSpellList()) do
|
||||
instance_container:AddValue (spell, spell.total, nil, " (" .. PetName:gsub ((" <.*"), "") .. ")")
|
||||
total = total + spell.total
|
||||
if (top < spell.total) then
|
||||
top = spell.total
|
||||
end
|
||||
amount = amount + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
amount = amount + 1
|
||||
end
|
||||
end
|
||||
|
||||
--loop end
|
||||
|
||||
--return the values
|
||||
return total, top, amount
|
||||
]],
|
||||
@@ -1892,14 +1918,19 @@
|
||||
end
|
||||
end
|
||||
if (not have) then
|
||||
setmetatable (MySpells, _detalhes.atributo_custom)
|
||||
MySpells.__index = _detalhes.atributo_custom
|
||||
|
||||
for i, custom in ipairs (self.custom) do
|
||||
if (custom.name == Loc ["STRING_CUSTOM_MYSPELLS"]) then
|
||||
table.remove (self.custom, i)
|
||||
tinsert (self.custom, i, MySpells)
|
||||
have = true
|
||||
end
|
||||
end
|
||||
setmetatable (MySpells, _detalhes.atributo_custom)
|
||||
MySpells.__index = _detalhes.atributo_custom
|
||||
self.custom [#self.custom+1] = MySpells
|
||||
if (not have) then
|
||||
self.custom [#self.custom+1] = MySpells
|
||||
end
|
||||
end
|
||||
|
||||
_detalhes:ResetCustomFunctionsCache()
|
||||
|
||||
@@ -2353,6 +2353,9 @@ function _detalhes:MontaAtributosOption (instancia, func)
|
||||
|
||||
--> custom
|
||||
|
||||
--GameCooltip:AddLine ("$div")
|
||||
CoolTip:AddLine ("$div", nil, 1, -2, 1)
|
||||
|
||||
CoolTip:AddMenu (1, func, nil, 5, nil, atributos.lista[5], nil, true)
|
||||
CoolTip:AddIcon ("Interface\\AddOns\\Details\\images\\atributos_icones", 1, 1, 20, 20, p*(5-1), p*(5), 0, 1)
|
||||
|
||||
@@ -2376,12 +2379,12 @@ function _detalhes:MontaAtributosOption (instancia, func)
|
||||
GameCooltip:SetWallpaper (2, [[Interface\TALENTFRAME\WarriorArm-TopLeft]], {1, 0, 0, 1}, {1, 1, 1, 0.1})
|
||||
|
||||
if (#_detalhes.custom == 0) then
|
||||
CoolTip:SetLastSelected (2, 5, 2)
|
||||
CoolTip:SetLastSelected (2, 6, 2)
|
||||
else
|
||||
if (instancia.atributo == 5) then
|
||||
CoolTip:SetLastSelected (2, 5, instancia.sub_atributo+2)
|
||||
CoolTip:SetLastSelected (2, 6, instancia.sub_atributo+2)
|
||||
else
|
||||
CoolTip:SetLastSelected (2, 5, instancia.sub_atributo_last [5]+2)
|
||||
CoolTip:SetLastSelected (2, 6, instancia.sub_atributo_last [5]+2)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2394,7 +2397,11 @@ function _detalhes:MontaAtributosOption (instancia, func)
|
||||
CoolTip:SetOption ("SelectedTopAnchorMod", -2)
|
||||
CoolTip:SetOption ("SelectedBottomAnchorMod", 2)
|
||||
|
||||
CoolTip:SetLastSelected (1, atributo_ativo)
|
||||
local last_selected = atributo_ativo
|
||||
if (atributo_ativo == 5) then
|
||||
last_selected = 6
|
||||
end
|
||||
CoolTip:SetLastSelected (1, last_selected)
|
||||
|
||||
CoolTip:SetWallpaper (1, [[Interface\SPELLBOOK\DeathKnightBlood-TopLeft]], {.6, 0.1, 0, 0.64453125}, {1, 1, 1, 0.1}, true)
|
||||
--CoolTip:SetWallpaper (1, [[Interface\ACHIEVEMENTFRAME\UI-Achievement-Parchment-Horizontal-Desaturated]], nil, {1, 1, 1, 0.3})
|
||||
|
||||
@@ -938,7 +938,7 @@ function gump:NewButton (parent, container, name, member, w, h, func, param1, pa
|
||||
ButtonObject.button.text:SetPoint ("center", ButtonObject.button, "center")
|
||||
|
||||
local text_width = ButtonObject.button.text:GetStringWidth()
|
||||
if (text_width > w-15) then
|
||||
if (text_width > w-15 and ButtonObject.button.text:GetText() ~= "") then
|
||||
if (not short_method) then
|
||||
local new_width = text_width+15
|
||||
ButtonObject.button:SetWidth (new_width)
|
||||
|
||||
+1
-1
@@ -443,7 +443,7 @@
|
||||
return aura_on_table
|
||||
end
|
||||
local aura_on = fw:CreateDropDown (f, aura_on_options, 1, 150, 20, "AuraOnDropdown", "$parentAuraOnDropdown")
|
||||
local aura_on_label = fw:CreateLabel (f, "Target: ", nil, nil, "GameFontNormal")
|
||||
local aura_on_label = fw:CreateLabel (f, "Trigger: ", nil, nil, "GameFontNormal")
|
||||
aura_on:SetPoint ("left", aura_on_label, "right", 2, 0)
|
||||
|
||||
--stack
|
||||
|
||||
+6
-1
@@ -915,7 +915,12 @@ function SlashCmdList.DETAILS (msg, editbox)
|
||||
DetailsPosBox:SetPoint ("center", UIParent, "center")
|
||||
end
|
||||
|
||||
DetailsPosBox.MyObject.text = "{x = " .. x .. ", y = " .. y .. "}"
|
||||
local one, two = rest:match("^(%S*)%s*(.-)$")
|
||||
if (one == "2") then
|
||||
DetailsPosBox.MyObject.text = "{x2 = " .. x .. ", y2 = " .. y .. "}"
|
||||
else
|
||||
DetailsPosBox.MyObject.text = "{x1 = " .. x .. ", y1 = " .. y .. "}"
|
||||
end
|
||||
DetailsPosBox.MyObject:SetFocus()
|
||||
DetailsPosBox.MyObject:HighlightText()
|
||||
|
||||
|
||||
+108
-1
@@ -312,5 +312,112 @@
|
||||
</Frame>
|
||||
</ScrollChild>
|
||||
</ScrollFrame>
|
||||
|
||||
|
||||
<Frame name="DetailsBoxAlertTemplateUp" inherits="GlowBoxTemplate" hidden="false" frameStrata="FULLSCREEN" virtual="true">
|
||||
<Layers>
|
||||
<Layer level="OVERLAY">
|
||||
<FontString name="$parentText" parentKey="text" inherits="GameFontHighlightLeft" justifyV="TOP" text="">
|
||||
<Size x="280" y="0"/>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" x="16" y="-15"/>
|
||||
</Anchors>
|
||||
</FontString>
|
||||
</Layer>
|
||||
</Layers>
|
||||
<Size x="300" y="150"/>
|
||||
<Frames>
|
||||
<Frame name="$parentArrow" parentKey="arrow" inherits="GlowBoxArrowTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOP" relativePoint="BOTTOM" x="40" y="1"/>
|
||||
</Anchors>
|
||||
</Frame>
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
<!-- raw copy of blizzard ui -->
|
||||
<Frame name="DetailsHelpBoxTemplate" inherits="GlowBoxTemplate" parent="UIParent" hidden="true" frameStrata="FULLSCREEN_DIALOG" frameLevel="2" virtual="true">
|
||||
<Size x="220" y="100"/>
|
||||
<Layers>
|
||||
<Layer level="OVERLAY">
|
||||
<FontString parentKey="Text" inherits="GameFontHighlightLeft">
|
||||
<Size x="200" y="0"/>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" x="15" y="-15"/>
|
||||
</Anchors>
|
||||
</FontString>
|
||||
</Layer>
|
||||
<Layer level="ARTWORK">
|
||||
<Texture parentKey="ArrowUP" inherits="HelpPlateArrowDOWN" hidden="true">
|
||||
<Size x="53" y="21"/>
|
||||
<Anchors>
|
||||
<Anchor point="TOP" relativePoint="BOTTOM" x="0" y="3"/>
|
||||
</Anchors>
|
||||
</Texture>
|
||||
<Texture parentKey="ArrowDOWN" inherits="HelpPlateArrowUP" hidden="true">
|
||||
<Size x="53" y="21"/>
|
||||
<Anchors>
|
||||
<Anchor point="BOTTOM" relativePoint="TOP" x="0" y="-3"/>
|
||||
</Anchors>
|
||||
</Texture>
|
||||
<Texture parentKey="ArrowRIGHT" inherits="HelpPlateArrowDOWN" hidden="true">
|
||||
<Size x="53" y="21"/>
|
||||
<Anchors>
|
||||
<Anchor point="RIGHT" relativePoint="LEFT" x="3" y="0"/>
|
||||
</Anchors>
|
||||
</Texture>
|
||||
<Texture parentKey="ArrowLEFT" inherits="HelpPlateArrowDOWN" hidden="true">
|
||||
<Size x="53" y="21"/>
|
||||
<Anchors>
|
||||
<Anchor point="LEFT" relativePoint="RIGHT" x="-3" y="0"/>
|
||||
</Anchors>
|
||||
</Texture>
|
||||
</Layer>
|
||||
<Layer level="BORDER">
|
||||
<Texture parentKey="ArrowGlowUP" inherits="HelpPlateArrow-GlowDOWN" hidden="true" alphaMode="ADD" alpha="0.5">
|
||||
<Size x="53" y="21"/>
|
||||
<Anchors>
|
||||
<Anchor point="TOP" relativePoint="BOTTOM" x="0" y="3"/>
|
||||
</Anchors>
|
||||
</Texture>
|
||||
<Texture parentKey="ArrowGlowDOWN" inherits="HelpPlateArrow-GlowUP" hidden="true" alphaMode="ADD" alpha="0.5">
|
||||
<Size x="53" y="21"/>
|
||||
<Anchors>
|
||||
<Anchor point="BOTTOM" relativePoint="TOP" x="0" y="-3"/>
|
||||
</Anchors>
|
||||
</Texture>
|
||||
<Texture parentKey="ArrowGlowRIGHT" inherits="HelpPlateArrow-GlowDOWN" hidden="true" alphaMode="ADD" alpha="0.5">
|
||||
<Size x="53" y="21"/>
|
||||
<Anchors>
|
||||
<Anchor point="RIGHT" relativePoint="LEFT" x="3" y="0"/>
|
||||
</Anchors>
|
||||
</Texture>
|
||||
<Texture parentKey="ArrowGlowLEFT" inherits="HelpPlateArrow-GlowDOWN" hidden="true" alphaMode="ADD" alpha="0.5">
|
||||
<Size x="53" y="21"/>
|
||||
<Anchors>
|
||||
<Anchor point="LEFT" relativePoint="RIGHT" x="-3" y="0"/>
|
||||
</Anchors>
|
||||
</Texture>
|
||||
</Layer>
|
||||
</Layers>
|
||||
<Frames>
|
||||
<Button name="$parentCloseButton" inherits="UIPanelCloseButton">
|
||||
<Size x="20" y="20"/>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" x="3" y="3"/>
|
||||
</Anchors>
|
||||
</Button>
|
||||
</Frames>
|
||||
<Scripts>
|
||||
<OnLoad>
|
||||
self.Text:SetSpacing(4);
|
||||
SetClampedTextureRotation(self.ArrowLEFT, 270);
|
||||
SetClampedTextureRotation(self.ArrowRIGHT, 90);
|
||||
SetClampedTextureRotation(self.ArrowGlowLEFT, 270);
|
||||
SetClampedTextureRotation(self.ArrowGlowRIGHT, 90);
|
||||
</OnLoad>
|
||||
<OnShow>
|
||||
self:SetHeight(self.Text:GetHeight()+30);
|
||||
</OnShow>
|
||||
</Scripts>
|
||||
</Frame>
|
||||
</Ui>
|
||||
@@ -110,6 +110,12 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section)
|
||||
window.Disable3DColorPick:Hide()
|
||||
window.Disable3DColorPick:Cancel()
|
||||
GameCooltip:Hide()
|
||||
|
||||
if (window.help_popups) then
|
||||
for _, widget in ipairs (window.help_popups) do
|
||||
widget:Hide()
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
--x 9 897 y 9 592
|
||||
@@ -267,6 +273,15 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section)
|
||||
|
||||
local instances = g:NewDropDown (window, _, "$parentInstanceSelectDropdown", "instanceDropdown", 200, 18, buildInstanceMenu, nil)
|
||||
instances:SetPoint ("bottomright", window, "bottomright", -17, 09)
|
||||
instances:SetHook ("OnEnter", function()
|
||||
GameCooltip:Reset()
|
||||
_detalhes:CooltipPreset (2)
|
||||
GameCooltip:AddLine (Loc ["STRING_MINITUTORIAL_OPTIONS_PANEL1"])
|
||||
GameCooltip:ShowCooltip (instances.widget, "tooltip")
|
||||
end)
|
||||
instances:SetHook ("OnLeave", function()
|
||||
GameCooltip:Hide()
|
||||
end)
|
||||
|
||||
local instances_string = g:NewLabel (window, nil, nil, "instancetext", Loc ["STRING_OPTIONS_EDITINSTANCE"], "GameFontNormal", 12)
|
||||
instances_string:SetPoint ("right", instances, "left", -2, 1)
|
||||
@@ -279,7 +294,7 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section)
|
||||
DetailsOptionsWindowGroupEditingText:SetText ("Editing Group")
|
||||
DetailsOptionsWindowGroupEditingText:SetPoint ("right", instances_string.widget, "left", -20, 0)
|
||||
DetailsOptionsWindowGroupEditingText:SetTextColor (1, 0.8, 0)
|
||||
group_editing.tooltip = "When checked, all windows in the group are also changed."
|
||||
group_editing.tooltip = Loc ["STRING_MINITUTORIAL_OPTIONS_PANEL2"]
|
||||
group_editing:SetHitRectInsets (0, -105, 0, 0)
|
||||
|
||||
group_editing:SetChecked (_detalhes.options_group_edit)
|
||||
@@ -287,6 +302,27 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section)
|
||||
group_editing:SetScript ("OnClick", function()
|
||||
_detalhes.options_group_edit = group_editing:GetChecked()
|
||||
end)
|
||||
|
||||
local group_editing_help = group_editing:CreateTexture (nil, "overlay")
|
||||
group_editing_help:SetSize (16, 16)
|
||||
group_editing_help:SetPoint ("right", group_editing, "left", -1, 0)
|
||||
group_editing_help:SetAlpha (0.6)
|
||||
group_editing_help:SetTexture ([[Interface\GossipFrame\IncompleteQuestIcon]])
|
||||
|
||||
local group_editing_help_frame = g:NewButton (group_editing, _, "$parentHelpButton", "HelpButton", 16, 16, _detalhes.empty_function)
|
||||
group_editing_help_frame:SetPoint ("right", group_editing_help, "right", 1, 0)
|
||||
--group_editing_help_frame:InstallCustomTexture()
|
||||
group_editing_help_frame:SetHook ("OnEnter", function()
|
||||
group_editing_help:SetTexture ([[Interface\GossipFrame\ActiveQuestIcon]])
|
||||
GameCooltip:Reset()
|
||||
_detalhes:CooltipPreset (2)
|
||||
GameCooltip:AddLine (Loc ["STRING_MINITUTORIAL_OPTIONS_PANEL3"])
|
||||
GameCooltip:ShowCooltip (group_editing_help_frame, "tooltip")
|
||||
end)
|
||||
group_editing_help_frame:SetHook ("OnLeave", function()
|
||||
group_editing_help:SetTexture ([[Interface\GossipFrame\IncompleteQuestIcon]])
|
||||
GameCooltip:Hide()
|
||||
end)
|
||||
|
||||
instances.OnDisable = function (self)
|
||||
instances_string:SetAlpha (0.4)
|
||||
@@ -1117,6 +1153,36 @@ local menus2 = {
|
||||
end
|
||||
end
|
||||
|
||||
-------------------------------------------------------------------------------------------------------------------
|
||||
--> helps tips on first run ~tutorial
|
||||
if (not _detalhes:GetTutorialCVar ("OPTIONS_PANEL_OPENED")) then
|
||||
_detalhes:SetTutorialCVar ("OPTIONS_PANEL_OPENED", true)
|
||||
|
||||
local create_test_bars = CreateFrame ("frame", "DetailsOptionsPanelPopUp1", DetailsOptionsWindow, "DetailsHelpBoxTemplate")
|
||||
create_test_bars.ArrowDOWN:Show()
|
||||
create_test_bars.ArrowGlowDOWN:Show()
|
||||
create_test_bars.Text:SetText (Loc ["STRING_MINITUTORIAL_OPTIONS_PANEL4"])
|
||||
create_test_bars:SetPoint ("top", fillbars.widget, "bottom", 0, -30)
|
||||
create_test_bars:Show()
|
||||
--
|
||||
local group_edit = CreateFrame ("frame", "DetailsOptionsPanelPopUp1", DetailsOptionsWindow, "DetailsHelpBoxTemplate")
|
||||
group_edit.ArrowDOWN:Show()
|
||||
group_edit.ArrowGlowDOWN:Show()
|
||||
group_edit.Text:SetText (Loc ["STRING_MINITUTORIAL_OPTIONS_PANEL5"])
|
||||
group_edit:SetPoint ("top", group_editing, "bottom", 0, -30)
|
||||
group_edit:Show()
|
||||
--
|
||||
local select_window = CreateFrame ("frame", "DetailsOptionsPanelPopUp1", DetailsOptionsWindow, "DetailsHelpBoxTemplate")
|
||||
select_window.ArrowDOWN:Show()
|
||||
select_window.ArrowGlowDOWN:Show()
|
||||
select_window.Text:SetText (Loc ["STRING_MINITUTORIAL_OPTIONS_PANEL6"])
|
||||
select_window:SetPoint ("top", instances.widget, "bottom", 0, -30)
|
||||
select_window:Show()
|
||||
|
||||
window.help_popups = {create_test_bars, group_edit, select_window}
|
||||
|
||||
end
|
||||
|
||||
|
||||
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
-- Advanced Settings - Tooltips ~20
|
||||
|
||||
+55
-10
@@ -918,6 +918,20 @@ local function move_janela (baseframe, iniciando, instancia, just_updating)
|
||||
|
||||
if (esquerda or baixo or direita or cima) then
|
||||
instancia:agrupar_janelas ({esquerda, baixo, direita, cima})
|
||||
|
||||
--> tutorial
|
||||
if (not _detalhes:GetTutorialCVar ("WINDOW_GROUP_MAKING1")) then
|
||||
_detalhes:SetTutorialCVar ("WINDOW_GROUP_MAKING1", true)
|
||||
|
||||
local group_tutorial = CreateFrame ("frame", "DetailsWindowGroupPopUp1", instancia.baseframe, "DetailsHelpBoxTemplate")
|
||||
group_tutorial.ArrowUP:Show()
|
||||
group_tutorial.ArrowGlowUP:Show()
|
||||
group_tutorial.Text:SetText (Loc ["STRING_MINITUTORIAL_WINDOWS1"])
|
||||
group_tutorial:SetPoint ("bottom", instancia_alvo.break_snap_button, "top", 0, 24)
|
||||
group_tutorial:Show()
|
||||
_detalhes.OnEnterMainWindow (instancia_alvo)
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
for _, esta_instancia in _ipairs (_detalhes.tabela_instancias) do
|
||||
@@ -1011,6 +1025,9 @@ end
|
||||
local BGFrame_scripts_onmouseup = function (self, button)
|
||||
|
||||
if (self.is_toolbar and self._instance.baseframe.isLocked and button == "LeftButton") then
|
||||
if (DetailsWindowLockPopUp1 and DetailsWindowLockPopUp1:IsShown()) then
|
||||
_G ["DetailsWindowLockPopUp1"]:Hide()
|
||||
end
|
||||
return self._instance.baseframe.button_stretch:GetScript ("OnMouseUp") (self._instance.baseframe.button_stretch, "LeftButton")
|
||||
end
|
||||
|
||||
@@ -1621,7 +1638,7 @@ local lockFunctionOnLeave = function (self)
|
||||
if (self.mostrando) then
|
||||
self.going_hide = true
|
||||
OnLeaveMainWindow (self.instancia, self)
|
||||
self.label:SetTextColor (.3, .3, .3, .6)
|
||||
self.label:SetTextColor (.6, .6, .6, .7)
|
||||
self.mostrando = false
|
||||
GameCooltip:ShowMe (false)
|
||||
end
|
||||
@@ -1652,6 +1669,20 @@ local lockFunctionOnClick = function (button)
|
||||
button:ClearAllPoints()
|
||||
button:SetPoint ("right", baseframe.resize_direita, "left", -1, 1.5)
|
||||
else
|
||||
|
||||
--> tutorial
|
||||
if (not _detalhes:GetTutorialCVar ("WINDOW_LOCK_UNLOCK1") and not _detalhes.initializing) then
|
||||
_detalhes:SetTutorialCVar ("WINDOW_LOCK_UNLOCK1", true)
|
||||
|
||||
local lock_tutorial = CreateFrame ("frame", "DetailsWindowLockPopUp1", baseframe, "DetailsHelpBoxTemplate")
|
||||
lock_tutorial.ArrowUP:Show()
|
||||
lock_tutorial.ArrowGlowUP:Show()
|
||||
lock_tutorial.Text:SetText (Loc ["STRING_MINITUTORIAL_WINDOWS2"])
|
||||
lock_tutorial:SetPoint ("bottom", baseframe.UPFrame, "top", 0, 20)
|
||||
lock_tutorial:Show()
|
||||
|
||||
end
|
||||
|
||||
baseframe.isLocked = true
|
||||
baseframe.instance.isLocked = true
|
||||
button.label:SetText (Loc ["STRING_UNLOCK_WINDOW"])
|
||||
@@ -2179,7 +2210,7 @@ local function button_stretch_scripts (baseframe, backgrounddisplay, instancia)
|
||||
_detalhes.atualizador = _detalhes:ScheduleRepeatingTimer ("AtualizaGumpPrincipal", _detalhes.update_speed, -1)
|
||||
_detalhes.stretch_changed_update_speed = nil
|
||||
end
|
||||
|
||||
|
||||
end)
|
||||
end
|
||||
|
||||
@@ -3006,7 +3037,7 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando)
|
||||
baseframe.lock_button:SetHeight (16)
|
||||
baseframe.lock_button.label = baseframe.lock_button:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
baseframe.lock_button.label:SetPoint ("right", baseframe.lock_button, "right")
|
||||
baseframe.lock_button.label:SetTextColor (.3, .3, .3, .6)
|
||||
baseframe.lock_button.label:SetTextColor (.6, .6, .6, .7)
|
||||
baseframe.lock_button.label:SetJustifyH ("right")
|
||||
baseframe.lock_button.label:SetText (Loc ["STRING_LOCK_WINDOW"])
|
||||
baseframe.lock_button:SetWidth (baseframe.lock_button.label:GetStringWidth()+2)
|
||||
@@ -3104,6 +3135,11 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando)
|
||||
|
||||
instancia.break_snap_button:SetScript ("OnClick", function()
|
||||
instancia:Desagrupar (-1)
|
||||
|
||||
--> hide tutorial
|
||||
if (DetailsWindowGroupPopUp1 and DetailsWindowGroupPopUp1:IsShown()) then
|
||||
DetailsWindowGroupPopUp1:Hide()
|
||||
end
|
||||
end)
|
||||
|
||||
instancia.break_snap_button:SetScript ("OnEnter", unSnapButtonOnEnter)
|
||||
@@ -4758,8 +4794,19 @@ local on_leave_menu = function (self, elapsed)
|
||||
end
|
||||
|
||||
local OnClickNovoMenu = function (_, _, id, instance)
|
||||
_detalhes.CriarInstancia (_, _, id)
|
||||
|
||||
local is_new
|
||||
if (not _detalhes.tabela_instancias [id]) then
|
||||
--> esta criando uma nova
|
||||
is_new = true
|
||||
end
|
||||
|
||||
local ninstance = _detalhes.CriarInstancia (_, _, id)
|
||||
instance.baseframe.cabecalho.modo_selecao:GetScript ("OnEnter")(instance.baseframe.cabecalho.modo_selecao)
|
||||
|
||||
if (ninstance and is_new) then
|
||||
ninstance.baseframe.cabecalho.modo_selecao:GetScript ("OnEnter")(ninstance.baseframe.cabecalho.modo_selecao)
|
||||
end
|
||||
end
|
||||
|
||||
local build_mode_list = function (self, elapsed)
|
||||
@@ -4839,7 +4886,6 @@ local build_mode_list = function (self, elapsed)
|
||||
CoolTip:AddMenu (2, _detalhes.SoloTables.EnableSoloMode, instancia, ptable [4], true, ptable [1], ptable [2], true)
|
||||
end
|
||||
end
|
||||
|
||||
CoolTip:SetWallpaper (2, [[Interface\SPELLBOOK\Spellbook-Page-1]], menu_wallpaper_tex, menu_wallpaper_color, true)
|
||||
end
|
||||
|
||||
@@ -4847,9 +4893,6 @@ local build_mode_list = function (self, elapsed)
|
||||
GameCooltip:AddLine ("$div")
|
||||
CoolTip:AddLine (Loc ["STRING_MENU_INSTANCE_CONTROL"])
|
||||
CoolTip:AddIcon ([[Interface\AddOns\Details\images\modo_icones]], 1, 1, 20, 20, 0.625, 0.75, 0, 1)
|
||||
|
||||
--CoolTip:AddMenu (2, _detalhes.OpenOptionsWindow, true, 1, nil, "Cant Create Window", _, true)
|
||||
--CoolTip:AddIcon ([[Interface\Buttons\UI-PlusButton-Up]], 2, 1, 16, 16)
|
||||
|
||||
local HaveClosedInstances = false
|
||||
for index = 1, math.min (#_detalhes.tabela_instancias, _detalhes.instances_amount), 1 do
|
||||
@@ -4861,7 +4904,7 @@ local build_mode_list = function (self, elapsed)
|
||||
end
|
||||
|
||||
if (_detalhes:GetNumInstancesAmount() < _detalhes:GetMaxInstancesAmount()) then
|
||||
CoolTip:AddMenu (2, OnClickNovoMenu, true, instancia, nil, "Create Window", _, true)
|
||||
CoolTip:AddMenu (2, OnClickNovoMenu, true, instancia, nil, Loc ["STRING_OPTIONS_WC_CREATE"], _, true)
|
||||
CoolTip:AddIcon ([[Interface\Buttons\UI-AttributeButton-Encourage-Up]], 2, 1, 16, 16)
|
||||
if (HaveClosedInstances) then
|
||||
GameCooltip:AddLine ("$div", nil, 2, nil, -5, -11)
|
||||
@@ -6715,6 +6758,8 @@ end
|
||||
GameCooltip:AddIcon ([[Interface\Buttons\UI-StopButton]], 1, 1, 14, 14, 0, 1, 0, 1, "red")
|
||||
GameCooltip:AddMenu (1, _detalhes.tabela_historico.resetar)
|
||||
|
||||
GameCooltip:AddLine ("$div", nil, 1, nil, -5, -11)
|
||||
|
||||
GameCooltip:AddLine (Loc ["STRING_ERASE_DATA_OVERALL"], nil, 1, "white", nil, _detalhes.font_sizes.menus, _detalhes.font_faces.menus)
|
||||
GameCooltip:AddIcon ([[Interface\Buttons\UI-StopButton]], 1, 1, 14, 14, 0, 1, 0, 1, "orange")
|
||||
GameCooltip:AddMenu (1, _detalhes.tabela_historico.resetar_overall)
|
||||
@@ -7321,7 +7366,7 @@ function gump:CriaCabecalho (baseframe, instancia)
|
||||
|
||||
|
||||
-- ~delete ~erase ~reset
|
||||
--> RESETAR HISTORICO ----------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--> reset ----------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
baseframe.cabecalho.reset = CreateFrame ("button", "DetailsClearSegmentsButton" .. instancia.meu_id, baseframe)
|
||||
baseframe.cabecalho.reset:SetFrameLevel (baseframe.UPFrame:GetFrameLevel()+1)
|
||||
|
||||
@@ -242,6 +242,11 @@ function _detalhes.switch:ShowMe (instancia)
|
||||
DetailsCtrlCloseWindowPanelTutorial.info_label:SetWidth (_detalhes.switch.frame:GetWidth()-30)
|
||||
DetailsCtrlCloseWindowPanelTutorial.close_label:SetWidth (_detalhes.switch.frame:GetWidth()-30)
|
||||
|
||||
_detalhes.switch.frame:SetPoint ("topleft", instancia.baseframe, "topleft", 0, 1)
|
||||
_detalhes.switch.frame:SetPoint ("bottomright", instancia.baseframe, "bottomright", 0, 1)
|
||||
_detalhes.switch.frame:SetBackdropColor (0.094, 0.094, 0.094, .8)
|
||||
_detalhes.switch.frame:Show()
|
||||
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 4.0 MiB After Width: | Height: | Size: 128 KiB |
@@ -35,6 +35,21 @@ local food_list = {
|
||||
[175220] = true, --
|
||||
[175222] = true, --
|
||||
[175223] = true, --
|
||||
|
||||
[180745] = true, --
|
||||
[180746] = true, --
|
||||
[180747] = true, --
|
||||
[180748] = true, --
|
||||
[180749] = true, --
|
||||
[180750] = true, --
|
||||
|
||||
[180757] = true, --
|
||||
[180758] = true, --
|
||||
[180761] = true, --
|
||||
[180759] = true, --
|
||||
[180762] = true, --
|
||||
[180760] = true, --
|
||||
|
||||
}
|
||||
|
||||
--> localization
|
||||
|
||||
Reference in New Issue
Block a user