diff --git a/TitanClassic/TitanClassic.toc b/TitanClassic/TitanClassic.toc index f95dd92..ed4048a 100644 --- a/TitanClassic/TitanClassic.toc +++ b/TitanClassic/TitanClassic.toc @@ -1,7 +1,7 @@ ## Interface: 30401 -## Title: Titan Panel Classic |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic |cff00aa001.5.6.30401|r ## Author: Titan Panel Development Team -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu ## Notes: Adds a display bar on the top and/or bottom of the screen. Allows users to show and control information/launcher plugins. diff --git a/TitanClassicAmmo/TitanClassicAmmo.lua b/TitanClassicAmmo/TitanClassicAmmo.lua index 8cdb97d..bf11492 100644 --- a/TitanClassicAmmo/TitanClassicAmmo.lua +++ b/TitanClassicAmmo/TitanClassicAmmo.lua @@ -121,7 +121,7 @@ print("GetAmmoCount" else ammo_count = GetInventoryItemCount("player", rangedSlotID) or ammo_count end - else +--[[ else ammo_name = select(1, GetItemInfo(GetInventoryItemID("player", ammoSlotID))) or _G["UNKNOWN"] if ammo_name == _G["UNKNOWN"] then ammo_count = 0 @@ -129,6 +129,21 @@ print("GetAmmoCount" ammo_count = GetInventoryItemCount("player", ammoSlotID) or ammo_count end end +]]-- + else + ammo_id = GetInventoryItemID("player",ammoSlotID) + if ammo_id ~= nil then + ammo_name = select(1, GetItemInfo(ammo_id))) or _G["UNKNOWN"] + else + ammo_name = _G["UNKNOWN"] + end + + if ammo_name == _G["UNKNOWN"] then + ammo_count = 0 + else + ammo_count = GetInventoryItemCount("player", ammoSlotID) or ammo_count + end + end end @@ -165,8 +180,8 @@ function TitanPanelAmmoButton_OnLoad(self) }; self:SetScript("OnEvent", function(_, event, arg1, ...) - if event == "PLAYER_ENTERING_WORLD" then - TitanPanelAmmoButton_PLAYER_ENTERING_WORLD() + if event == "PLAYER_LOGIN" then + TitanPanelAmmoButton_PLAYER_LOGIN() elseif event == "UNIT_INVENTORY_CHANGED" then TitanPanelAmmoButton_UNIT_INVENTORY_CHANGED(arg1, ...) elseif event == "UPDATE_INVENTORY_DURABILITY" then @@ -178,13 +193,13 @@ function TitanPanelAmmoButton_OnLoad(self) end end) - TitanPanelAmmoButton:RegisterEvent("PLAYER_ENTERING_WORLD") + TitanPanelAmmoButton:RegisterEvent("PLAYER_LOGIN") end -function TitanPanelAmmoButton_PLAYER_ENTERING_WORLD() +function TitanPanelAmmoButton_PLAYER_LOGIN() -- Class check if class ~= "ROGUE" and class ~= "WARRIOR" and class ~= "HUNTER" then - TitanPanelAmmoButton_PLAYER_ENTERING_WORLD = nil + TitanPanelAmmoButton_PLAYER_LOGIN = nil ClrAmmoInfo() return end @@ -200,7 +215,7 @@ function TitanPanelAmmoButton_PLAYER_ENTERING_WORLD() TitanPanelAmmoButton:RegisterEvent("UNIT_INVENTORY_CHANGED") TitanPanelAmmoButton:RegisterEvent("MERCHANT_CLOSED") TitanPanelAmmoButton:RegisterEvent("PLAYER_ENTERING_WORLD") - TitanPanelAmmoButton_PLAYER_ENTERING_WORLD = nil + TitanPanelAmmoButton_PLAYER_LOGIN = nil end function TitanPanelAmmoButton_UNIT_INVENTORY_CHANGED(arg1, ...) diff --git a/TitanClassicAmmo/TitanClassicAmmo.toc b/TitanClassicAmmo/TitanClassicAmmo.toc index 7e48e24..2e8a5d7 100644 --- a/TitanClassicAmmo/TitanClassicAmmo.toc +++ b/TitanClassicAmmo/TitanClassicAmmo.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fAmmo|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fAmmo|r] |cff00aa001.5.6.30401|r ## Notes: Adds an ammo monitor to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicAmmo.xml \ No newline at end of file diff --git a/TitanClassicBag/TitanClassicBag.toc b/TitanClassicBag/TitanClassicBag.toc index 0ef7f36..c8a6e15 100644 --- a/TitanClassicBag/TitanClassicBag.toc +++ b/TitanClassicBag/TitanClassicBag.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fBag|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fBag|r] |cff00aa001.5.6.30401|r ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicBag.xml diff --git a/TitanClassicClock/TitanClassicClock.toc b/TitanClassicClock/TitanClassicClock.toc index af0cb91..22b4b8e 100644 --- a/TitanClassicClock/TitanClassicClock.toc +++ b/TitanClassicClock/TitanClassicClock.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fClock|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fClock|r] |cff00aa001.5.6.30401|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicClock.xml diff --git a/TitanClassicGold/TitanClassicGold.toc b/TitanClassicGold/TitanClassicGold.toc index cbe62e3..8ef58fc 100644 --- a/TitanClassicGold/TitanClassicGold.toc +++ b/TitanClassicGold/TitanClassicGold.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fGold|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fGold|r] |cff00aa001.5.6.30401|r ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: GoldSave ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicGold.xml diff --git a/TitanClassicLocation/TitanClassicLocation.toc b/TitanClassicLocation/TitanClassicLocation.toc index 72aeb0b..b552460 100644 --- a/TitanClassicLocation/TitanClassicLocation.toc +++ b/TitanClassicLocation/TitanClassicLocation.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fLocation|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fLocation|r] |cff00aa001.5.6.30401|r ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicLocation.xml diff --git a/TitanClassicLootType/TitanClassicLootType.toc b/TitanClassicLootType/TitanClassicLootType.toc index 23a815b..a6c144e 100644 --- a/TitanClassicLootType/TitanClassicLootType.toc +++ b/TitanClassicLootType/TitanClassicLootType.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fLootType|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fLootType|r] |cff00aa001.5.6.30401|r ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: TitanClassicLootTypeSaved ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicLootType.xml diff --git a/TitanClassicPerformance/TitanClassicPerformance.toc b/TitanClassicPerformance/TitanClassicPerformance.toc index 050c35d..71a1ee5 100644 --- a/TitanClassicPerformance/TitanClassicPerformance.toc +++ b/TitanClassicPerformance/TitanClassicPerformance.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fPerformance|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fPerformance|r] |cff00aa001.5.6.30401|r ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicPerformance.xml diff --git a/TitanClassicRegen/TitanClassicRegen.toc b/TitanClassicRegen/TitanClassicRegen.toc index 11b088d..c179b7e 100644 --- a/TitanClassicRegen/TitanClassicRegen.toc +++ b/TitanClassicRegen/TitanClassicRegen.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fRegen|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fRegen|r] |cff00aa001.5.6.30401|r ## Notes: Adds a regen monitor to Titan panel to show HP/MANA regen ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicRegen.xml \ No newline at end of file diff --git a/TitanClassicRepair/TitanClassicRepair.toc b/TitanClassicRepair/TitanClassicRepair.toc index 1a9ed92..d551b6a 100644 --- a/TitanClassicRepair/TitanClassicRepair.toc +++ b/TitanClassicRepair/TitanClassicRepair.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fRepair|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fRepair|r] |cff00aa001.5.6.30401|r ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicRepair.xml diff --git a/TitanClassicVolume/TitanClassicVolume.toc b/TitanClassicVolume/TitanClassicVolume.toc index cceb2bc..366c720 100644 --- a/TitanClassicVolume/TitanClassicVolume.toc +++ b/TitanClassicVolume/TitanClassicVolume.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fVolume|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fVolume|r] |cff00aa001.5.6.30401|r ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicVolume.xml diff --git a/TitanClassicXP/TitanClassicXP.toc b/TitanClassicXP/TitanClassicXP.toc index 004e488..e6e9775 100644 --- a/TitanClassicXP/TitanClassicXP.toc +++ b/TitanClassicXP/TitanClassicXP.toc @@ -1,10 +1,10 @@ ## Interface: 30401 -## Title: Titan Panel Classic [|cffeda55fXP|r] |cff00aa001.5.5.30401|r +## Title: Titan Panel Classic [|cffeda55fXP|r] |cff00aa001.5.6.30401|r ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: TitanClassic -## Version: 1.5.5.30401 +## Version: 1.5.6.30401 ## X-Child-Of: TitanClassic TitanClassicXP.xml