diff --git a/TitanClassic/locale/Localization.BR.lua b/TitanClassic/locale/Localization.BR.lua index 014959e..37c566c 100644 --- a/TitanClassic/locale/Localization.BR.lua +++ b/TitanClassic/locale/Localization.BR.lua @@ -4,6 +4,7 @@ if not L then return end L["TITAN_PANEL"] = "Painel Titan Classic"; local TITAN_PANEL = "Painel Titan Classic"; L["TITAN_PANEL_ONLY"] = "Painel Titan"; +local TITAN_PANEL_ONLY = "Painel Titan"; L["TITAN_DEBUG"] = "<Titan>"; L["TITAN_PRINT"] = "Titan"; diff --git a/TitanClassic/locale/Localization.CN.lua b/TitanClassic/locale/Localization.CN.lua index c0a71ad..c64ab95 100644 --- a/TitanClassic/locale/Localization.CN.lua +++ b/TitanClassic/locale/Localization.CN.lua @@ -4,6 +4,7 @@ if not L then return end L["TITAN_PANEL"] = "Titan Panel Classic"; local TITAN_PANEL = "Titan Panel Classic"; L["TITAN_PANEL_ONLY"] = "Titan Panel"; +local TITAN_PANEL_ONLY = "Titan Panel"; L["TITAN_DEBUG"] = "<Titan>"; L["TITAN_PRINT"] = "Titan"; diff --git a/TitanClassic/locale/Localization.DE.lua b/TitanClassic/locale/Localization.DE.lua index 57cc2ae..032ba47 100644 --- a/TitanClassic/locale/Localization.DE.lua +++ b/TitanClassic/locale/Localization.DE.lua @@ -4,6 +4,7 @@ if not L then return end L["TITAN_PANEL"] = "Titan Panel Classic"; local TITAN_PANEL = "Titan Panel Classic"; L["TITAN_PANEL_ONLY"] = "Titan Panel"; +local TITAN_PANEL_ONLY = "Titan Panel"; L["TITAN_DEBUG"] = "<Titan>"; L["TITAN_PRINT"] = "Titan"; diff --git a/TitanClassic/locale/Localization.ES.lua b/TitanClassic/locale/Localization.ES.lua index a42fb7d..b4019ce 100644 --- a/TitanClassic/locale/Localization.ES.lua +++ b/TitanClassic/locale/Localization.ES.lua @@ -4,6 +4,7 @@ if not L then return end L["TITAN_PANEL"] = "Titan Panel Classic"; local TITAN_PANEL = "Titan Panel Classic"; L["TITAN_PANEL_ONLY"] = "Titan Panel"; +local TITAN_PANEL_ONLY = "Titan Panel"; L["TITAN_DEBUG"] = "<Titan>"; L["TITAN_PRINT"] = "Titan"; diff --git a/TitanClassic/locale/Localization.FR.lua b/TitanClassic/locale/Localization.FR.lua index 5f17daa..0c60adc 100644 --- a/TitanClassic/locale/Localization.FR.lua +++ b/TitanClassic/locale/Localization.FR.lua @@ -4,6 +4,7 @@ if not L then return end L["TITAN_PANEL"] = "Titan Panel Classic"; local TITAN_PANEL = "Titan Panel Classic"; L["TITAN_PANEL_ONLY"] = "Titan Panel"; +local TITAN_PANEL_ONLY = "Titan Panel"; L["TITAN_DEBUG"] = "<Titan>"; L["TITAN_PRINT"] = "Titan"; diff --git a/TitanClassic/locale/Localization.IT.lua b/TitanClassic/locale/Localization.IT.lua index e71888e..8601e71 100644 --- a/TitanClassic/locale/Localization.IT.lua +++ b/TitanClassic/locale/Localization.IT.lua @@ -4,6 +4,7 @@ if not L then return end L["TITAN_PANEL"] = "Titan Panel Classic"; local TITAN_PANEL = "Titan Panel Classic"; L["TITAN_PANEL_ONLY"] = "Titan Panel"; +local TITAN_PANEL_ONLY = "Titan Panel"; L["TITAN_DEBUG"] = "<Titan>"; L["TITAN_PRINT"] = "Titan"; diff --git a/TitanClassic/locale/Localization.KR.lua b/TitanClassic/locale/Localization.KR.lua index 436a965..824e583 100644 --- a/TitanClassic/locale/Localization.KR.lua +++ b/TitanClassic/locale/Localization.KR.lua @@ -4,6 +4,7 @@ if not L then return end L["TITAN_PANEL"] = "타이탄 패널 Classic"; local TITAN_PANEL = "타이탄 패널 Classic"; L["TITAN_PANEL_ONLY"] = "타이탄 패널"; +local TITAN_PANEL_ONLY = "타이탄 패널"; L["TITAN_DEBUG"] = "<Titan>"; L["TITAN_PRINT"] = "Titan"; diff --git a/TitanClassic/locale/Localization.RU.lua b/TitanClassic/locale/Localization.RU.lua index acae6fa..a483bb9 100644 --- a/TitanClassic/locale/Localization.RU.lua +++ b/TitanClassic/locale/Localization.RU.lua @@ -4,6 +4,7 @@ if not L then return end L["TITAN_PANEL"] = "Титан Панель Classic"; local TITAN_PANEL = "Титан Панель Classic"; L["TITAN_PANEL_ONLY"] = "Титан Панель"; +local TITAN_PANEL_ONLY = "Титан Панель"; L["TITAN_DEBUG"] = "<Титан>"; L["TITAN_PRINT"] = "Титан"; diff --git a/TitanClassic/locale/Localization.TW.lua b/TitanClassic/locale/Localization.TW.lua index 402fbf1..82310bc 100644 --- a/TitanClassic/locale/Localization.TW.lua +++ b/TitanClassic/locale/Localization.TW.lua @@ -4,6 +4,7 @@ if not L then return end L["TITAN_PANEL"] = "Titan Panel Classic"; local TITAN_PANEL = "Titan Panel Classic"; L["TITAN_PANEL_ONLY"] = "Titan Panel"; +local TITAN_PANEL_ONLY = "Titan Panel"; L["TITAN_DEBUG"] = "<Titan>"; L["TITAN_PRINT"] = "Titan"; diff --git a/TitanClassic/locale/Localization.lua b/TitanClassic/locale/Localization.lua index 2bac62a..b65c25a 100644 --- a/TitanClassic/locale/Localization.lua +++ b/TitanClassic/locale/Localization.lua @@ -3,6 +3,7 @@ local L = LibStub("AceLocale-3.0"):NewLocale("TitanClassic","enUS",true) L["TITAN_PANEL"] = "Titan Panel Classic"; local TITAN_PANEL = "Titan Panel Classic"; L["TITAN_PANEL_ONLY"] = "Titan Panel"; +local TITAN_PANEL_ONLY = "Titan Panel"; L["TITAN_DEBUG"] = "<Titan>"; L["TITAN_PRINT"] = "Titan"; diff --git a/TitanClassicAmmo/TitanClassicAmmo.lua b/TitanClassicAmmo/TitanClassicAmmo.lua index 769d581..09cec8a 100644 --- a/TitanClassicAmmo/TitanClassicAmmo.lua +++ b/TitanClassicAmmo/TitanClassicAmmo.lua @@ -149,6 +149,14 @@ function TitanPanelAmmoButton_PLAYER_LOGIN() if class ~= "ROGUE" and class ~= "WARRIOR" and class ~= "HUNTER" then TitanPanelAmmoButton_PLAYER_LOGIN = nil ammo_show = true + self.registry = { + controlVariables = { + ShowIcon = false, + ShowLabelText = false, + } + }; + TitanPanelButton_UpdateButton(TITAN_AMMO_ID); + --TitanPanelButton_OnLoad(self); return end diff --git a/TitanClassicRepair/TitanClassicRepair.lua b/TitanClassicRepair/TitanClassicRepair.lua index 0ea2330..709b249 100644 --- a/TitanClassicRepair/TitanClassicRepair.lua +++ b/TitanClassicRepair/TitanClassicRepair.lua @@ -728,6 +728,7 @@ function TitanRepair_GetStatusStr(index, short) -- local item_cost = TitanRepair_GetCostStr(item_status.cost); local item_cost = TitanPanelRepair_GetTextGSC(item_status.values.cost); if (not TPR.MerchantisOpen) and (not TPR.WholeScanInProgress) then +--[[ if TitanGetVar(TITAN_REPAIR_ID, "DiscountFriendly") then item_cost = TitanPanelRepair_GetTextGSC(item_status.values.cost * 0.95); elseif TitanGetVar(TITAN_REPAIR_ID, "DiscountHonored") then @@ -737,11 +738,15 @@ function TitanRepair_GetStatusStr(index, short) elseif TitanGetVar(TITAN_REPAIR_ID, "DiscountExalted") then item_cost = TitanPanelRepair_GetTextGSC(item_status.values.cost * 0.80); end +]] + if TitanGetVar(TITAN_REPAIR_ID, "DiscountHonored") then + item_cost = TitanPanelRepair_GetTextGSC(item_status.values.cost * 0.90); + end end if ((not short) and item_cost and TitanGetVar(TITAN_REPAIR_ID,"ShowRepairCost")) then if (not TPR.MerchantisOpen) and (not TPR.WholeScanInProgress) then - if TitanGetVar(TITAN_REPAIR_ID, "DiscountFriendly") then +--[[ if TitanGetVar(TITAN_REPAIR_ID, "DiscountFriendly") then valueText = valueText .. "\t" .. item_cost..TitanUtils_GetGreenText(" ("..FACTION_STANDING_LABEL5..")"); elseif TitanGetVar(TITAN_REPAIR_ID, "DiscountHonored") then valueText = valueText .. "\t" .. item_cost..TitanUtils_GetGreenText(" ("..FACTION_STANDING_LABEL6..")"); @@ -752,6 +757,12 @@ function TitanRepair_GetStatusStr(index, short) else valueText = valueText .. "\t" .. item_cost; end +]] + if TitanGetVar(TITAN_REPAIR_ID, "DiscountHonored") then + valueText = valueText .. "\t" .. item_cost..TitanUtils_GetGreenText(" ("..FACTION_STANDING_LABEL6..")"); + else + valueText = valueText .. "\t" .. item_cost; + end end end @@ -938,7 +949,7 @@ function TitanPanelRepairButton_GetButtonText(id) end if (not TPR.MerchantisOpen or (TPR.MerchantisOpen and not canRepair)) then - if TitanGetVar(TITAN_REPAIR_ID, "DiscountFriendly") then +--[[ if TitanGetVar(TITAN_REPAIR_ID, "DiscountFriendly") then sum = sum * 0.95; discountlabel = FACTION_STANDING_LABEL5; elseif TitanGetVar(TITAN_REPAIR_ID, "DiscountHonored") then @@ -951,6 +962,11 @@ function TitanPanelRepairButton_GetButtonText(id) sum = sum * 0.80; discountlabel = FACTION_STANDING_LABEL8; end -- if merchant +]] + if TitanGetVar(TITAN_REPAIR_ID, "DiscountHonored") then + sum = sum * 0.90; + discountlabel = FACTION_STANDING_LABEL6; + end -- if merchant end -- if discounts -- select which % to show @@ -1121,17 +1137,19 @@ local info; info = {}; info.text = L["REPAIR_LOCALE"]["buttonNormal"]; - info.checked = not TitanGetVar(TITAN_REPAIR_ID,"DiscountFriendly") and not TitanGetVar(TITAN_REPAIR_ID,"DiscountHonored") and not TitanGetVar(TITAN_REPAIR_ID,"DiscountRevered") and not TitanGetVar(TITAN_REPAIR_ID,"DiscountExalted"); + --info.checked = not TitanGetVar(TITAN_REPAIR_ID,"DiscountFriendly") and not TitanGetVar(TITAN_REPAIR_ID,"DiscountHonored") and not TitanGetVar(TITAN_REPAIR_ID,"DiscountRevered") and not TitanGetVar(TITAN_REPAIR_ID,"DiscountExalted"); + info.checked = not TitanGetVar(TITAN_REPAIR_ID,"DiscountHonored"); info.disabled = TPR.MerchantisOpen; info.func = function() - TitanSetVar(TITAN_REPAIR_ID,"DiscountFriendly", nil) + --TitanSetVar(TITAN_REPAIR_ID,"DiscountFriendly", nil) TitanSetVar(TITAN_REPAIR_ID,"DiscountHonored", nil) - TitanSetVar(TITAN_REPAIR_ID,"DiscountRevered", nil) - TitanSetVar(TITAN_REPAIR_ID,"DiscountExalted", nil) + --TitanSetVar(TITAN_REPAIR_ID,"DiscountRevered", nil) + --TitanSetVar(TITAN_REPAIR_ID,"DiscountExalted", nil) TitanPanelButton_UpdateButton(TITAN_REPAIR_ID) end L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); +--[[ info = {}; info.text = L["REPAIR_LOCALE"]["buttonFriendly"]; info.checked = TitanGetVar(TITAN_REPAIR_ID,"DiscountFriendly"); @@ -1144,20 +1162,20 @@ local info; TitanPanelButton_UpdateButton(TITAN_REPAIR_ID) end L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); - +]] info = {}; info.text = L["REPAIR_LOCALE"]["buttonHonored"]; info.checked = TitanGetVar(TITAN_REPAIR_ID,"DiscountHonored"); info.disabled = TPR.MerchantisOpen; info.func = function() - TitanSetVar(TITAN_REPAIR_ID,"DiscountFriendly", nil) + --TitanSetVar(TITAN_REPAIR_ID,"DiscountFriendly", nil) TitanSetVar(TITAN_REPAIR_ID,"DiscountHonored", 1) - TitanSetVar(TITAN_REPAIR_ID,"DiscountRevered", nil) - TitanSetVar(TITAN_REPAIR_ID,"DiscountExalted", nil) + --TitanSetVar(TITAN_REPAIR_ID,"DiscountRevered", nil) + --TitanSetVar(TITAN_REPAIR_ID,"DiscountExalted", nil) TitanPanelButton_UpdateButton(TITAN_REPAIR_ID) end L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); - +--[[ info = {}; info.text = L["REPAIR_LOCALE"]["buttonRevered"]; info.checked = TitanGetVar(TITAN_REPAIR_ID,"DiscountRevered"); @@ -1183,6 +1201,7 @@ local info; TitanPanelButton_UpdateButton(TITAN_REPAIR_ID) end L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); +]] end if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "Options" then