Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

- Fixed some issues with spec icons where sometimes it shows four small icons.

Browse Source
This commit is contained in:
Tercio
2015-07-14 19:22:46 -03:00
parent e8b0b5687a
commit 37e6802efb
7 changed files with 77 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+4 -3
View File
File diff suppressed because one or more lines are too long
classes/classe_custom.lua
+8 -3
View File
@@ -681,9 +681,14 @@
esta_barra.icone_classe:SetTexCoord (0.078125, 0.921875, 0.078125, 0.921875)
esta_barra.icone_classe:SetTexture (self.icon)
else
if (instancia.row_info.use_spec_icons and (self.spec or self.my_actor.spec)) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec or self.my_actor.spec]))
if (instancia.row_info.use_spec_icons) then
if (self.spec or self.my_actor.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec or self.my_actor.spec]))
else
esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_small]])
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
end
else
esta_barra.icone_classe:SetTexture (instancia.row_info.icon_file)
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
classes/classe_damage.lua
+10 -4
View File
@@ -2648,10 +2648,16 @@ end
esta_barra.icone_classe:SetVertexColor (actor_class_color_r, actor_class_color_g, actor_class_color_b)
else
if (instancia.row_info.use_spec_icons and self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
if (instancia.row_info.use_spec_icons) then
if (self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
else
esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_small]])
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
end
else
esta_barra.icone_classe:SetTexture (instancia.row_info.icon_file)
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
classes/classe_energy.lua
+22 -11
View File
@@ -274,12 +274,17 @@ function atributo_energy:AtualizarResources (qual_barra, colocacao, instancia)
esta_barra.icone_classe:SetVertexColor (actor_class_color_r, actor_class_color_g, actor_class_color_b)
else
if (instancia.row_info.use_spec_icons and self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec]))
else
if (instancia.row_info.use_spec_icons) then
if (self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec]))
else
esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_small]])
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
end
else
esta_barra.icone_classe:SetTexture (instancia.row_info.icon_file)
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe])) --very slow method
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
end
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
end
@@ -796,13 +801,19 @@ function atributo_energy:RefreshBarra (esta_barra, instancia, from_resize)
esta_barra.icone_classe:SetVertexColor (actor_class_color_r, actor_class_color_g, actor_class_color_b)
else
if (instancia.row_info.use_spec_icons and self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
else
if (instancia.row_info.use_spec_icons) then
if (self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
else
esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_small]])
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
end
else
esta_barra.icone_classe:SetTexture (instancia.row_info.icon_file)
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe])) --very slow method
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
end
end
classes/classe_heal.lua
+11 -5
View File
@@ -907,13 +907,19 @@ function atributo_heal:RefreshBarra (esta_barra, instancia, from_resize)
esta_barra.icone_classe:SetVertexColor (actor_class_color_r, actor_class_color_g, actor_class_color_b)
else
if (instancia.row_info.use_spec_icons and self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec])) --very slow method
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
if (instancia.row_info.use_spec_icons) then
if (self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
else
esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_small]])
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
end
else
esta_barra.icone_classe:SetTexture (instancia.row_info.icon_file)
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe])) --very slow method
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
end
end
classes/classe_others.lua
+11 -5
View File
@@ -983,13 +983,19 @@ function atributo_misc:RefreshBarra (esta_barra, instancia, from_resize)
esta_barra.icone_classe:SetVertexColor (actor_class_color_r, actor_class_color_g, actor_class_color_b)
else
if (instancia.row_info.use_spec_icons and self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
if (instancia.row_info.use_spec_icons) then
if (self.spec) then
esta_barra.icone_classe:SetTexture (instancia.row_info.spec_file)
esta_barra.icone_classe:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
else
esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_small]])
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
end
else
esta_barra.icone_classe:SetTexture (instancia.row_info.icon_file)
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe])) --very slow method
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [self.classe]))
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
end
end
functions/skins.lua
+11 -9
View File
@@ -340,7 +340,7 @@ local _
["text_face"] = "Accidental Presidency",
["anchor"] = {
-18, -- [1]
4, -- [2]
3, -- [2]
},
["text_color"] = {
1, -- [1]
@@ -360,7 +360,7 @@ local _
true, -- [5]
false, -- [6]
["space"] = -3,
["shadow"] = false,
["shadow"] = true,
},
["desaturated_menu"] = false,
["micro_displays_side"] = 2,
@@ -752,7 +752,7 @@ local _
instance_cprops = {
["show_statusbar"] = false,
["menu_icons_size"] = 0.850000023841858,
["menu_icons_size"] = 0.80,
["color"] = {
0.211764705882353, -- [1]
0.282352941176471, -- [2]
@@ -761,7 +761,7 @@ local _
},
["menu_anchor"] = {
17, -- [1]
0, -- [2]
-1, -- [2]
["side"] = 2,
},
["bg_r"] = 0,
@@ -786,7 +786,7 @@ local _
["text_face"] = "Accidental Presidency",
["anchor"] = {
-17, -- [1]
3, -- [2]
2, -- [2]
},
["text_size"] = 12,
["enable_custom_text"] = false,
@@ -852,7 +852,7 @@ local _
["font_face_file"] = "Interface\\Addons\\Details\\fonts\\Accidental Presidency.ttf",
["textL_custom_text"] = "{data1}. {data3}{data2}",
["font_size"] = 10,
["height"] = 15,
["height"] = 14,
["texture_file"] = "Interface\\AddOns\\Details\\images\\BantoBar",
["icon_file"] = "Interface\\AddOns\\Details\\images\\classes_small",
["textR_bracket"] = "(",
@@ -1111,7 +1111,7 @@ local _
["custom_text"] = "{name}",
["text_face"] = "FORCED SQUARE",
["anchor"] = {
-16,
-15,
5,
},
["text_size"] = 12,
@@ -1171,6 +1171,7 @@ local _
0,
0,
},
["use_spec_icons"] = true,
["icon_file"] = "Interface\\AddOns\\Details\\images\\spec_icons_normal_alpha",
["textL_show_number"] = true,
["texture"] = "Skyline",
@@ -1484,7 +1485,7 @@ local _
["text_face"] = "FORCED SQUARE",
["anchor"] = {
-19, -- [1]
6, -- [2]
5, -- [2]
},
["text_color"] = {
1, -- [1]
@@ -1698,6 +1699,7 @@ local _
["row_info"] = {
["textR_outline"] = false,
["textL_outline"] = false,
["use_spec_icons"] = true,
["textL_enable_custom_text"] = false,
["icon_file"] = "Interface\\AddOns\\Details\\images\\spec_icons_normal",
["texture_background_file"] = "Interface\\AddOns\\Details\\images\\BantoBar",
@@ -1803,7 +1805,7 @@ local _
["enable_custom_text"] = false,
["custom_text"] = "{name}",
["text_face"] = "FORCED SQUARE",
["anchor"] = {-18, 6},
["anchor"] = {-18, 5},
["text_color"] = {1,1,1,0.7},
["text_size"] = 12,
},