- Fixed an issue with Alliance or Horde icons showing at random in player bars.

- Fixed the Death Recap window not showing data during battlegrounds.
- Fixed new segment creation when the option to use only one segment while in a battleground is disabled.
- Fixed east asian number format on several strings.
- 'Smart Score' option renamed to "Unique Segment" under the PvP options for battlegrounds.
This commit is contained in:
Tercio
2018-08-13 17:01:58 -03:00
parent 1fe339f168
commit 9af2eabb13
23 changed files with 516 additions and 130 deletions
+11 -5
View File
@@ -4301,12 +4301,18 @@ function window:CreateFrame1()
_detalhes:SelectNumericalSystem (systemNumber)
end
local asian1K, asian10K, asian1B = _detalhes.gump:GetAsianNumberSymbols()
local asianNumerals = {value = 2, label = Loc ["STRING_NUMERALSYSTEM_MYRIAD_EASTASIA"], desc = "1" .. asian1K .. " = 1.000 \n1" .. asian10K .. " = 10.000 \n10" .. asian10K .. " = 100.000 \n100" .. asian10K .. " = 1.000.000", onclick = onSelectNumeralSystem, icon = icon, iconcolor = iconcolor, iconsize = iconsize}
--> if region is western it'll be using Korean symbols, set a font on the dropdown so it won't show ?????
local clientRegion = _detalhes.gump:GetClientRegion()
if (clientRegion == "western" or clientRegion == "russia") then
asianNumerals.descfont = _detalhes.gump:GetBestFontForLanguage ("koKR")
end
local numeralSystems = {
{value = 1, label = Loc ["STRING_NUMERALSYSTEM_ARABIC_WESTERN"], desc = "1K = 1.000 \n10K = 10.000 \n100K = 100.000 \n1M = 1.000.000", onclick = onSelectNumeralSystem, icon = icon, iconcolor = iconcolor, iconsize = iconsize},
{value = 2, label = Loc ["STRING_NUMERALSYSTEM_MYRIAD_EASTASIA"], desc = "1천 = 1.000 \n1만 = 10.000 \n10만 = 100.000 \n100만 = 1.000.000", onclick = onSelectNumeralSystem, icon = icon, iconcolor = iconcolor, iconsize = iconsize},
asianNumerals
}
local buildNumeralSystemsMenu = function()
@@ -4842,14 +4848,14 @@ function window:CreateFrame2()
--> battleground
--> remote parser
g:NewLabel (frame2, _, "$parentRemoteParserLabel", "RemoteParserLabel", Loc ["STRING_OPTIONS_BG_REMOTE_PARSER"], "GameFontHighlightLeft")
g:NewLabel (frame2, _, "$parentRemoteParserLabel", "RemoteParserLabel", Loc ["STRING_OPTIONS_BG_UNIQUE_SEGMENT"], "GameFontHighlightLeft")
g:NewSwitch (frame2, _, "$parentRemoteParserSlider", "RemoteParserSlider", 60, 20, _, _, _detalhes.use_battleground_server_parser, nil, nil, nil, nil, options_switch_template)
frame2.RemoteParserSlider:SetPoint ("left", frame2.RemoteParserLabel, "right", 2)
frame2.RemoteParserSlider:SetAsCheckBox()
frame2.RemoteParserSlider.OnSwitch = function (self, _, value)
_detalhes.use_battleground_server_parser = value
end
window:CreateLineBackground2 (frame2, "RemoteParserSlider", "RemoteParserLabel", Loc ["STRING_OPTIONS_BG_REMOTE_PARSER_DESC"])
window:CreateLineBackground2 (frame2, "RemoteParserSlider", "RemoteParserLabel", Loc ["STRING_OPTIONS_BG_UNIQUE_SEGMENT_DESC"])
--> show all
g:NewLabel (frame2, _, "$parentShowAllLabel", "ShowAllLabel", Loc ["STRING_OPTIONS_BG_ALL_ALLY"], "GameFontHighlightLeft")
+1
View File
@@ -7236,6 +7236,7 @@ function _detalhes:RefreshAttributeTextSize()
end
end
-- ~encounter ~timer
function _detalhes:CheckForTextTimeCounter (combat_start)
if (combat_start) then
if (_detalhes.tabela_vigente.is_boss) then
+19 -3
View File
@@ -4,7 +4,7 @@ local SharedMedia = LibStub:GetLibrary("LibSharedMedia-3.0")
local g = _detalhes.gump
local _
function _detalhes:OpenWelcomeWindow ()
function _detalhes:OpenWelcomeWindow()
GameCooltip:Close()
local window = _G.DetailsWelcomeWindow
@@ -759,9 +759,25 @@ local window_openned_at = time()
NumeralType1_text:SetPoint ("topleft", window, "topleft", 40, -150)
local NumeralType2_text = window:CreateFontString (nil, "overlay", "GameFontNormal")
NumeralType2_text:SetText ("1천 = 1.000 |cFFFFCC00| |r1만 = 10.000 |cFFFFCC00| |r10만 = 100.000 |cFFFFCC00| |r100만 = 1.000.000")
local asian1K, asian10K, asian1B = _detalhes.gump:GetAsianNumberSymbols()
local asianNumerals = "1" .. asian1K .. " = 1.000 \n1" .. asian10K .. " = 10.000 \n10" .. asian10K .. " = 100.000 \n100" .. asian10K .. " = 1.000.000"
--> if region is western it'll be using Korean symbols, set a font on the dropdown so it won't show ?????
local clientRegion = _detalhes.gump:GetClientRegion()
if (clientRegion == "western" or clientRegion == "russia") then
_detalhes.gump:SetFontFace (NumeralType2_text, _detalhes.gump:GetBestFontForLanguage ("koKR"))
else
_detalhes.gump:SetFontFace (NumeralType2_text, _detalhes.gump:GetBestFontForLanguage())
end
--> set the text
NumeralType2_text:SetText (asianNumerals)
NumeralType2_text:SetWidth (500)
NumeralType2_text:SetHeight (40)
NumeralType2_text:SetHeight (80)
NumeralType2_text:SetJustifyH ("left")
NumeralType2_text:SetJustifyV ("top")
NumeralType2_text:SetTextColor (.8, .8, .8, 1)