From 476ef1b01372202f77ecaf66321a595e3ea10d69 Mon Sep 17 00:00:00 2001 From: shagu Date: Sat, 22 Oct 2016 15:03:26 +0200 Subject: [PATCH] show colors for quivers, profession-, and soulbags --- env/locales_deDE.lua | 6 ++++++ env/locales_enUS.lua | 6 ++++++ env/locales_frFR.lua | 6 ++++++ env/locales_ruRU.lua | 6 ++++++ env/locales_zhCN.lua | 6 ++++++ modules/bags.lua | 24 +++++++++++++++++++++++- pfUI.lua | 1 + 7 files changed, 54 insertions(+), 1 deletion(-) diff --git a/env/locales_deDE.lua b/env/locales_deDE.lua index 3f417960..6bf375a1 100644 --- a/env/locales_deDE.lua +++ b/env/locales_deDE.lua @@ -10,6 +10,12 @@ pfLocaleClass["deDE"] = { ["Schurke"] = "ROGUE", } +pfLocaleBagtypes["deDE"] = { + ["Köcher"] = "QUIVER", + ["Seelentasche"] = "SOULBAG", + ["Behälter"] = "DEFAULT", +} + pfLocaleShift["deDE"] = { ['BattleStance'] = "Kampfhaltung", ['DefensiveStance'] = "Verteidigungshaltung", diff --git a/env/locales_enUS.lua b/env/locales_enUS.lua index eff5404a..08bb4d43 100644 --- a/env/locales_enUS.lua +++ b/env/locales_enUS.lua @@ -10,6 +10,12 @@ pfLocaleClass["enUS"] = { ["Rogue"] = "ROGUE", } +pfLocaleBagtypes["enUS"] = { + ["Quiver"] = "QUIVER", + ["Soul Bag"] = "SOULBAG", + ["Bag"] = "DEFAULT" +} + pfLocaleShift["enUS"] = { ['BattleStance'] = "Battle Stance", ['DefensiveStance'] = "Defensive Stance", diff --git a/env/locales_frFR.lua b/env/locales_frFR.lua index 79ee5485..617d17c5 100644 --- a/env/locales_frFR.lua +++ b/env/locales_frFR.lua @@ -10,6 +10,12 @@ pfLocaleClass["frFR"] = { ["Voleur"] = "ROGUE", } +pfLocaleBagtypes["frFR"] = { + ["Carquois"] = "QUIVER", + ["Sac d'\195\162me"] = "SOULBAG", + ["Conteneur"] = "DEFAULT" +} + pfLocaleShift["frFR"] = { -- TODO ['BattleStance'] = "Battle Stance", ['DefensiveStance'] = "Defensive Stance", diff --git a/env/locales_ruRU.lua b/env/locales_ruRU.lua index 36a62a78..3dfc5867 100644 --- a/env/locales_ruRU.lua +++ b/env/locales_ruRU.lua @@ -10,6 +10,12 @@ pfLocaleClass["ruRU"] = { ["Разбойница"] = "ROGUE", } +pfLocaleBagtypes["ruRU"] = { + ["Амуниция"] = "QUIVER", + ["Сумка душ"] = "SOULBAG", + ["Сумка"] = "DEFAULT" +} + pfLocaleShift["ruRU"] = { -- TODO ['BattleStance'] = "Battle Stance", ['DefensiveStance'] = "Defensive Stance", diff --git a/env/locales_zhCN.lua b/env/locales_zhCN.lua index 1c8924a0..eeb62f17 100644 --- a/env/locales_zhCN.lua +++ b/env/locales_zhCN.lua @@ -10,6 +10,12 @@ pfLocaleClass["zhCN"] = { ["盗贼"] = "ROGUE", } +pfLocaleBagtypes["zhCN"] = { + ["箭袋"] = "QUIVER", + ["灵魂袋"] = "SOULBAG", + ["包裹"] = "DEFAULT" +} + pfLocaleShift["zhCN"] = { -- TODO ['BattleStance'] = "Battle Stance", ['DefensiveStance'] = "Defensive Stance", diff --git a/modules/bags.lua b/modules/bags.lua index 18a76260..ec939792 100644 --- a/modules/bags.lua +++ b/modules/bags.lua @@ -226,7 +226,29 @@ pfUI:RegisterModule("bags", function () if quality and quality > 1 then pfUI.bags[bag].slots[slot].frame:SetBackdropBorderColor(GetItemQualityColor(quality)) else - pfUI.bags[bag].slots[slot].frame:SetBackdropBorderColor(.3,.3,.3,1) + local bagtype + if bag > 0 then + local _, _, id = strfind(GetInventoryItemLink("player", ContainerIDToInventoryID(bag)) or "", "item:(%d+)"); + local _, _, _, _, itemType, subType = GetItemInfo(id); + bagtype = pfLocaleBagtypes[pfUI.cache["locale"]][itemType] + bagsubtype = pfLocaleBagtypes[pfUI.cache["locale"]][subType] + + if bagsubtype == "SOULBAG" then + bagtype = "SOULBAG" + elseif not (bagsubtype and bagsubtype == "DEFAULT") and bagtype ~= "QUIVER" and bagtype ~= "SOULBAG" then + bagtype = "SPECIAL" + end + end + + if bagtype == "QUIVER" then + pfUI.bags[bag].slots[slot].frame:SetBackdropBorderColor(.8,.8,.2,1) + elseif bagtype == "SOULBAG" then + pfUI.bags[bag].slots[slot].frame:SetBackdropBorderColor(.5,.2,.2,1) + elseif bagtype == "SPECIAL" then + pfUI.bags[bag].slots[slot].frame:SetBackdropBorderColor(.2,.2,.8,1) + else + pfUI.bags[bag].slots[slot].frame:SetBackdropBorderColor(.3,.3,.3,1) + end end if not pfUI.bags[bag].slots[slot].stacks then diff --git a/pfUI.lua b/pfUI.lua index 1e9ab2e4..4aef0d5b 100644 --- a/pfUI.lua +++ b/pfUI.lua @@ -51,6 +51,7 @@ pfUI.cache = {} pfUI.module = {} pfUI.modules = {} pfLocaleClass = {} +pfLocaleBagtypes = {} pfLocaleShift = {} pfLocaleSpells = {} pfLocaleSpellEvents = {}