13 Commits

4 changed files with 443 additions and 180 deletions

View File

@ -1,9 +1,8 @@
## Interface: 50400 ## Interface: 60200
## Author: Ramble (modified by Isharra) (updated by thegabbert) (converted to Ace3 by Takika) ## Author: Ramble (modified by Isharra) (updated by thegabbert) (converted to Ace3 by Takika)
## Version: 51
## Title: MyBags |cff007FFF -Ace3-|r ## Title: MyBags |cff007FFF -Ace3-|r
## Notes: Complete Replacement for Inventory and Bank Bags. ## Notes: Complete Replacement for Inventory and Bank Bags.
## OptionalDeps: MyBagsCache, DataStore_Containers ## OptionalDeps: MyBagsCache, DataStore, DataStore_Containers, DataStore_Characters
## SavedVariables: MyInventoryDB, MyBankDB, MyEquipmentDB ## SavedVariables: MyInventoryDB, MyBankDB, MyEquipmentDB
Embeds.xml Embeds.xml
@ -14,4 +13,3 @@ MyBagsCore\MyBags.xml
MyInventory\MyInventory.xml MyInventory\MyInventory.xml
MyBank\MyBank.xml MyBank\MyBank.xml
MyEquipment\MyEquipment.xml MyEquipment\MyEquipment.xml

View File

@ -11,7 +11,10 @@ local function GetItemInfoFromLink(l)
if (not l) then if (not l) then
return return
end end
local c, id, il, n = select(3, strfind(l, "|cff(%x+)|Hitem:(%-?%d+)([^|]+)|h%[(.-)%]|h|r"))
local c, t, id, il, n = select(3, strfind(l, "|cff(%x+)|H(%l+):(%-?%d+)([^|]+)|h%[(.-)%]|h|r"))
-- return n, c, id .. il, id, t
return n, c, id .. il, id return n, c, id .. il, id
end end

File diff suppressed because it is too large Load Diff

View File

@ -399,6 +399,7 @@ function MyBank:OnEnable()
MyBankFrameBag4:SetID(9) MyBankFrameBag4:SetID(9)
MyBankFrameBag5:SetID(10) MyBankFrameBag5:SetID(10)
MyBankFrameBag6:SetID(11) MyBankFrameBag6:SetID(11)
if self.GetOpt("Replace") then if self.GetOpt("Replace") then
BankFrame:UnregisterEvent("BANKFRAME_OPENED") BankFrame:UnregisterEvent("BANKFRAME_OPENED")
BankFrame:UnregisterEvent("BANKFRAME_CLOSED") BankFrame:UnregisterEvent("BANKFRAME_CLOSED")
@ -406,18 +407,19 @@ function MyBank:OnEnable()
end end
MyBankFramePortrait:SetTexture("Interface\\Addons\\MyBags\\Skin\\MyBankPortrait") MyBankFramePortrait:SetTexture("Interface\\Addons\\MyBags\\Skin\\MyBankPortrait")
StaticPopupDialogs["PURCHASE_BANKBAG"] = { StaticPopupDialogs["PURCHASE_BANKBAG"] = {
preferredIndex = STATICPOPUPS_NUMDIALOGS,
text = TEXT(CONFIRM_BUY_BANK_SLOT), text = TEXT(CONFIRM_BUY_BANK_SLOT),
button1 = TEXT(YES), button1 = TEXT(YES),
button2 = TEXT(NO), button2 = TEXT(NO),
OnAccept = function() OnAccept = function(self)
if CT_oldPurchaseSlot then if CT_oldPurchaseSlot then
CT_oldPurchaseSlot() CT_oldPurchaseSlot()
else else
PurchaseSlot() PurchaseSlot()
end; end;
end, end,
OnShow = function() OnShow = function(self)
MoneyFrame_Update(this:GetName().."MoneyFrame", GetBankSlotCost()); MoneyFrame_Update(self:GetName() .. "MoneyFrame", GetBankSlotCost());
end, end,
showAlert = 1, showAlert = 1,
hasMoneyFrame = 1, hasMoneyFrame = 1,