Skip to content

Commit

Permalink
- Plugin 'Damage Rank': is now called 'Damage, the Game!' and had its…
Browse files Browse the repository at this point in the history
… levels adjusted to WoD.

- Plugin 'Tiny Threat': fixed player name where it was showing the realm name too.
- Plugin 'Vanguard': fixed frame details (clicking on a bar) shown behind the Vanguard panel.
- Plugin 'Vanguard': fixed a problem when clicking with right button wasn't opening the bookmark panel.
- Plugin 'Vanguard': incoming heals now count shield amount on the player too.
- Plugin 'Vanguard' Known Bug: incoming damage and melee vs avoidance seems to be inaccurate by now, we need more time to study and fix it.
- Plugin 'Raid Check': now has an options panel.

- Added Twins Ogron's Charge as custom spells, one for the charge by him self and other for the copies (mythic only).
- Added key bindings for open a window, close a window, select a bookmark.
- Added 'CTRL + RightClick' closes a window.

- Fixed wallpaper transparency after releasing the window from a stretch.
- Fixed few issues when using class text colors.
- Fixed characters name outside instances, now it replaces the realm name with a * and show the complete name on tooltip.
- Fixed damage mitigation on damage taken, this affects only specific classes like monk tank.
- Fixed auto erase poping up when the player enters on its garrison.
- Fixed segments tooltip showing trash cleanup segments inside garrisons.
- Fixed command /details disable, wasn't disabling the capture of cooldowns.
- Fixed a problem with fast dps/hps when the window is in a empty segment.
- Fixed an issue using bookmark panel where it wasn't changing the display when the window is in a plugin mode.
  • Loading branch information
Tercio authored and Tercio committed Jan 7, 2015
1 parent faaf638 commit 23f8ca0
Show file tree
Hide file tree
Showing 14 changed files with 376 additions and 43 deletions.
124 changes: 121 additions & 3 deletions Bindings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,129 @@
<Bindings>
<Binding name="DETAILS_RESET_SEGMENTS" description="Clear all segments." header="Details">
<Binding name="DETAILS_RESET_SEGMENTS" description="Clear all segments." header="DETAILS_KEYBIND_SEGMENTCONTROL" category="Details!">
_detalhes.tabela_historico:resetar()
</Binding>
<Binding name="DETAILS_SCROLL_DOWN" description="Scroll down the window which you have the mouse over." header="Details">

<Binding name="DETAILS_SCROLL_DOWN" description="Scroll down the window which you have the mouse over." header="DETAILS_KEYBIND_SCROLLING" category="Details!">
DetailsKeyBindScrollDown()
</Binding>
<Binding name="DETAILS_SCROLL_UP" description="Scroll up the window which you have the mouse over." header="Details">

<Binding name="DETAILS_SCROLL_UP" description="Scroll up the window which you have the mouse over." category="Details!">
DetailsKeyBindScrollUp()
</Binding>

<Binding name="DETAILS_REOPEN_WINDOW1" description="Reopen window 1." header="DETAILS_KEYBIND_WINDOW_CONTROL" category="Details!">
local instance1 = _detalhes.tabela_instancias [1];
if (instance1 and not instance1:IsEnabled()) then
instance1:EnableInstance();
elseif (not instance1) then
_detalhes:Msg ("Window 1 isn't created yet.");
end
</Binding>
<Binding name="DETAILS_REOPEN_WINDOW2" description="Reopen window 2." category="Details!">
local instance2 = _detalhes.tabela_instancias [2];
if (instance2 and not instance2:IsEnabled()) then
instance2:EnableInstance();
elseif (not instance2) then
_detalhes:Msg ("Window 2 isn't created yet.");
end
</Binding>
<Binding name="DETAILS_REOPEN_WINDOW3" description="Reopen window 3." category="Details!">
local instance3 = _detalhes.tabela_instancias [3];
if (instance3 and not instance3:IsEnabled()) then
instance3:EnableInstance();
elseif (not instance3) then
_detalhes:Msg ("Window 3 isn't created yet.");
end
</Binding>
<Binding name="DETAILS_REOPEN_WINDOW4" description="Reopen window 4." category="Details!">
local instance4 = _detalhes.tabela_instancias [4];
if (instance4 and not instance4:IsEnabled()) then
instance4:EnableInstance();
elseif (not instance4) then
_detalhes:Msg ("Window 4 isn't created yet.");
end
</Binding>
<Binding name="DETAILS_REOPEN_WINDOW5" description="Reopen window 5." category="Details!">
local instance5 = _detalhes.tabela_instancias [5];
if (instance5 and not instance5:IsEnabled()) then
instance5:EnableInstance();
elseif (not instance5) then
_detalhes:Msg ("Window 5 isn't created yet.");
end
</Binding>

<Binding name="DETAILS_CLOSE_WINDOW1" description="Close window 1." category="Details!">
local instance1 = _detalhes.tabela_instancias [1];
if (instance1 and instance1:IsEnabled()) then
instance1:ShutDown();
else
_detalhes:Msg ("Window 1 isn't open.");
end
</Binding>
<Binding name="DETAILS_CLOSE_WINDOW2" description="Close window 2." category="Details!">
local instance2 = _detalhes.tabela_instancias [2];
if (instance2 and instance2:IsEnabled()) then
instance2:ShutDown();
else
_detalhes:Msg ("Window 2 isn't open.");
end
</Binding>
<Binding name="DETAILS_CLOSE_WINDOW3" description="Close window 3." category="Details!">
local instance3 = _detalhes.tabela_instancias [3];
if (instance3 and instance3:IsEnabled()) then
instance3:ShutDown();
else
_detalhes:Msg ("Window 3 isn't open.");
end
</Binding>
<Binding name="DETAILS_CLOSE_WINDOW4" description="Close window 4." category="Details!">
local instance4 = _detalhes.tabela_instancias [4];
if (instance4 and instance4:IsEnabled()) then
instance4:ShutDown();
else
_detalhes:Msg ("Window 4 isn't open.");
end
</Binding>
<Binding name="DETAILS_CLOSE_WINDOW5" description="Close window 5." category="Details!">
local instance5 = _detalhes.tabela_instancias [5];
if (instance5 and instance5:IsEnabled()) then
instance5:ShutDown();
else
_detalhes:Msg ("Window 5 isn't open.");
end
</Binding>


<Binding name="DETAILS_BOOKMARK1" description="Change the display on the first window to bookmark #1." header="DETAILS_KEYBIND_BOOKMARK" category="Details!">
DetailsChangeDisplayFromBookmark (1);
</Binding>
<Binding name="DETAILS_BOOKMARK2" description="Change the display on the first window to bookmark #2." category="Details!">
DetailsChangeDisplayFromBookmark (2);
</Binding>
<Binding name="DETAILS_BOOKMARK3" description="Change the display on the first window to bookmark #3." category="Details!">
DetailsChangeDisplayFromBookmark (3);
</Binding>
<Binding name="DETAILS_BOOKMARK4" description="Change the display on the first window to bookmark #4." category="Details!">
DetailsChangeDisplayFromBookmark (4);
</Binding>
<Binding name="DETAILS_BOOKMARK5" description="Change the display on the first window to bookmark #5." category="Details!">
DetailsChangeDisplayFromBookmark (5);
</Binding>
<Binding name="DETAILS_BOOKMARK6" description="Change the display on the first window to bookmark #6." category="Details!">
DetailsChangeDisplayFromBookmark (6);
</Binding>
<Binding name="DETAILS_BOOKMARK7" description="Change the display on the first window to bookmark #7." category="Details!">
DetailsChangeDisplayFromBookmark (7);
</Binding>
<Binding name="DETAILS_BOOKMARK8" description="Change the display on the first window to bookmark #8." category="Details!">
DetailsChangeDisplayFromBookmark (8);
</Binding>
<Binding name="DETAILS_BOOKMARK9" description="Change the display on the first window to bookmark #9." category="Details!">
DetailsChangeDisplayFromBookmark (9);
</Binding>
<Binding name="DETAILS_BOOKMARK10" description="Change the display on the first window to bookmark #10." category="Details!">
DetailsChangeDisplayFromBookmark (10);
</Binding>


</Bindings>
4 changes: 4 additions & 0 deletions Details.toc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ locales\Details-enUS.lua
locales\Details-ptBR.lua
locales\Details-esES.lua
locales\Details-esMX.lua
locales\Details-deDE.lua
locales\Details-frFR.lua
locales\Details-koKR.lua
locales\Details-ruRU.lua

boot.lua
indent.lua
Expand Down
53 changes: 41 additions & 12 deletions boot.lua

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion classes/classe_damage.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@ function atributo_damage:RefreshWindow (instancia, tabela_do_combate, forcar, ex
end

if (use_animations) then
instancia:fazer_animacoes()
instancia:fazer_animacoes (qual_barra - 1)
end

--> beta, hidar barras não usadas durante um refresh forçado
Expand Down
2 changes: 1 addition & 1 deletion classes/classe_heal.lua
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ function atributo_heal:RefreshWindow (instancia, tabela_do_combate, forcar, expo
end

if (use_animations) then
instancia:fazer_animacoes()
instancia:fazer_animacoes (qual_barra - 1)
end

if (instancia.atributo == 5) then --> custom
Expand Down
17 changes: 16 additions & 1 deletion classes/classe_instancia.lua
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ end

end

--> desativando a instância ela fica em stand by e apenas hida a janela
--> desativando a instância ela fica em stand by e apenas hida a janela ~shutdown ~close ~fechar
function _detalhes:DesativarInstancia()

local lower = _detalhes:GetLowerInstanceNumber()
Expand Down Expand Up @@ -649,6 +649,21 @@ end
return _detalhes:Msg (Loc ["STRING_INSTANCE_LIMIT"])
end

--> verifica se não tem uma janela na pool de janelas fechadas
local next_id = #_detalhes.tabela_instancias+1

if (_detalhes.unused_instances [next_id]) then
local new_instance = _detalhes.unused_instances [next_id]
_detalhes.tabela_instancias [next_id] = new_instance
_detalhes.unused_instances [next_id] = nil
new_instance:AtivarInstancia()

_detalhes:GetLowerInstanceNumber()

return new_instance
end

--> cria uma nova janela
local new_instance = _detalhes:NovaInstancia (#_detalhes.tabela_instancias+1)

if (not _detalhes.initializing) then
Expand Down
6 changes: 3 additions & 3 deletions core/gears.lua
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ function _detalhes:GetPerformanceRaidType()

if (type == "raid") then
--mythic
--if (difficulty == 15) then
-- return "Mythic"
--end
if (difficulty == 15) then
return "Mythic"
end

--raid finder
if (difficulty == 7) then
Expand Down
33 changes: 20 additions & 13 deletions core/parser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@
who_name = "[*] "..spellname
end

local real_damage = amount or 0
if (absorbed) then
amount = absorbed + (amount or 0)
end
Expand Down Expand Up @@ -305,7 +304,7 @@

this_event [1] = true --> true if this is a damage || false for healing
this_event [2] = spellid --> spellid || false if this is a battle ress line
this_event [3] = real_damage --> amount of damage or healing
this_event [3] = amount --> amount of damage or healing
this_event [4] = time --> parser time
this_event [5] = _UnitHealth (alvo_name) --> current unit heal
this_event [6] = who_name --> source name
Expand Down Expand Up @@ -370,15 +369,6 @@
end
end

------------------------------------------------------------------------------------------------
--> damage taken

--> target
jogador_alvo.damage_taken = jogador_alvo.damage_taken + real_damage --> adiciona o dano tomado
if (not jogador_alvo.damage_from [who_name]) then --> adiciona a pool de dano tomado de quem
jogador_alvo.damage_from [who_name] = true
end

------------------------------------------------------------------------------------------------
--> time start

Expand Down Expand Up @@ -438,7 +428,7 @@

this_event [1] = true --> true if this is a damage || false for healing
this_event [2] = spellid --> spellid || false if this is a battle ress line
this_event [3] = real_damage --> amount of damage or healing
this_event [3] = amount --> amount of damage or healing
this_event [4] = time --> parser time
this_event [5] = _UnitHealth (alvo_name) --> current unit heal
this_event [6] = who_name --> source name
Expand All @@ -462,10 +452,27 @@
friend.total = friend.total + amount
friend.spells [spellid] = (friend.spells [spellid] or 0) + amount

------------------------------------------------------------------------------------------------
--> damage taken

--> target
jogador_alvo.damage_taken = jogador_alvo.damage_taken + amount - (absorbed or 0) --> adiciona o dano tomado
if (not jogador_alvo.damage_from [who_name]) then --> adiciona a pool de dano tomado de quem
jogador_alvo.damage_from [who_name] = true
end

return true
else
_current_total [1] = _current_total [1]+amount

------------------------------------------------------------------------------------------------
--> damage taken

--> target
jogador_alvo.damage_taken = jogador_alvo.damage_taken + amount --> adiciona o dano tomado
if (not jogador_alvo.damage_from [who_name]) then --> adiciona a pool de dano tomado de quem
jogador_alvo.damage_from [who_name] = true
end
end

------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -2649,7 +2656,7 @@
_detalhes.latest_ENCOUNTER_END = _GetTime()

--_detalhes.encounter_table ["end"] = time() - 0.4
_detalhes.encounter_table ["end"] = _GetTime() -- - 0.4 --0.4 para o antigo metodo de tempo
_detalhes.encounter_table ["end"] = _GetTime() -- 0.351

local _, _, _, _, _, _, _, zoneMapID = _GetInstanceInfo()

Expand Down
5 changes: 3 additions & 2 deletions core/windows.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
local _math_floor = math.floor --lua local
local _type = type --lua local
local _math_abs = math.abs --lua local
local _math_min = math.min
local _ipairs = ipairs --lua local

local _GetScreenWidth = GetScreenWidth --wow api local
Expand Down Expand Up @@ -64,12 +65,12 @@
-- /run print( _detalhes:GetInstance(1).rowframe:GetParent():GetName())
-- /run print (DetailsBarra_1_1:GetParent():GetName())

function _detalhes:fazer_animacoes()
function _detalhes:fazer_animacoes (amt_barras)
--aqui

if (self.bars_sort_direction == 2) then

for i = self.rows_fit_in_window - 1, 1, -1 do
for i = _math_min (self.rows_fit_in_window, amt_barras) - 1, 1, -1 do
local row = self.barras [i]
local row_proxima = self.barras [i-1]

Expand Down
1 change: 1 addition & 0 deletions functions/profiles.lua
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@ local default_global_data = {
main_help_button = 0,
alert_frames = {false, false, false, false, false, false},
bookmark_tutorial = false,
ctrl_click_close_tutorial = false,
},
performance_profiles = {
["RaidFinder"] = {enabled = false, update_speed = 1, use_row_animations = false, damage = true, heal = true, aura = true, energy = false, miscdata = true},
Expand Down
3 changes: 2 additions & 1 deletion gumps/janela_principal.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1969,6 +1969,7 @@ function _detalhes:ReportSingleLine (instancia, barra)
return _detalhes:Reportar (reportar, {_no_current = true, _no_inverse = true, _custom = true})
end

-- ~stretch
local function button_stretch_scripts (baseframe, backgrounddisplay, instancia)
local button = baseframe.button_stretch

Expand Down Expand Up @@ -2115,7 +2116,7 @@ local function button_stretch_scripts (baseframe, backgrounddisplay, instancia)
if (esta_instancia.wallpaper.enabled) then
_r, _g, _b = esta_instancia.baseframe.wallpaper:GetVertexColor()
_a = esta_instancia.baseframe.wallpaper:GetAlpha()
gump:GradientEffect (esta_instancia.baseframe.wallpaper, "texture", _r, _g, _b, _a, _r, _g, _b, esta_instancia.baseframe.wallpaper.alpha, 1.0)
gump:GradientEffect (esta_instancia.baseframe.wallpaper, "texture", _r, _g, _b, _a, _r, _g, _b, esta_instancia.wallpaper.alpha, 1.0)
end

esta_instancia.baseframe:SetFrameStrata (esta_instancia.strata)
Expand Down
Loading

0 comments on commit 23f8ca0

Please sign in to comment.