Skip to content

Commit

Permalink
save commit for first recipe system add
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hoizame
Hoizame committed Jul 10, 2019
1 parent a4668d9 commit e2cbfb2
Show file tree
Hide file tree
Showing 8 changed files with 1,010 additions and 118 deletions.
2 changes: 2 additions & 0 deletions AtlasLootClassic/AtlasLootClassic.toc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ MiniMapButton.lua

Data\Token.lua
Data\Sets.lua
Data\Profession.lua
Data\Recipe.lua

ItemDB\ItemDB.lua
ItemDB\SoundData.lua
Expand Down
16 changes: 10 additions & 6 deletions AtlasLootClassic/Button/Button.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ function Button:CreateSecOnly(frame)
button.secButton.overlay:Hide()

button.secButton.count = button.secButton:CreateFontString(buttonName.."_secCount", "ARTWORK", "AtlasLoot_ItemAmountFont")
button.secButton.count:SetPoint("BOTTOMRIGHT", button.secButton.icon, "BOTTOMRIGHT", 0, 1)
button.secButton.count:SetPoint("BOTTOMRIGHT", button.secButton.icon, "BOTTOMRIGHT", -1, 1)
button.secButton.count:SetJustifyH("RIGHT")
button.secButton.count:SetHeight(15)
button.secButton.count:SetText(15)
Expand Down Expand Up @@ -906,13 +906,17 @@ function Button:ExtraItemFrame_GetFrame(button, itemList)
end
end
end
frame:ClearAllPoints()
frame:SetParent(button:GetParent():GetParent())
frame:SetPoint("TOPLEFT", button, "BOTTOMLEFT")
frame:SetFrameStrata("TOOLTIP")

local newParent = button:GetParent():GetParent()
if newParent ~= frame then
frame:ClearAllPoints()
frame:SetParent(newParent)
frame:SetPoint("TOPLEFT", button, "BOTTOMLEFT")
frame:SetFrameStrata("TOOLTIP")
frame.button = button
end
frame:Show()
frame.ItemList = itemList
frame.button = button

return frame
end
Expand Down
18 changes: 13 additions & 5 deletions AtlasLootClassic/Button/Item_type.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Item.Query = Query
local AL = AtlasLoot.Locales
local ClickHandler = AtlasLoot.ClickHandler
local Token = AtlasLoot.Data.Token
local Recipe = AtlasLoot.Data.Recipe

local db

Expand All @@ -24,6 +25,7 @@ local GetItemDescInfo = AtlasLoot.ItemInfo.GetDescription
local GetItemString = AtlasLoot.ItemString.Create

local ITEM_COLORS = {}
local WHITE_ICON_FRAME = "Interface\\Common\\WhiteIconFrame"

local ItemClickHandler = nil
local itemIsOnEnter = nil
Expand Down Expand Up @@ -100,8 +102,11 @@ function Item.OnMouseAction(button, mouseButton)
end
elseif mouseButton == "ShowExtraItems" then
if Token.IsToken(button.ItemID) then
button.IsToken = true
button.ExtraFrameShown = true
AtlasLoot.Button:ExtraItemFrame_GetFrame(button, Token.GetTokenData(button.ItemID))
elseif Recipe.IsRecipe(button.ItemID) then
button.ExtraFrameShown = true
AtlasLoot.Button:ExtraItemFrame_GetFrame(button, Recipe.GetRecipeDataForExtraFrame(button.ItemID))
end
elseif mouseButton == "MouseWheelUp" and Item.previewTooltipFrame and Item.previewTooltipFrame:IsShown() then -- ^
local frame = Item.previewTooltipFrame.modelFrame
Expand Down Expand Up @@ -175,9 +180,10 @@ function Item.OnClear(button)
button.overlay:Hide()
end
button.secButton.overlay:Hide()
if button.IsToken then
button.secButton.overlay:SetDesaturated(false)
if button.ExtraFrameShown then
AtlasLoot.Button:ExtraItemFrame_ClearFrame()
button.IsToken = false
button.ExtraFrameShown = false
end
end

Expand All @@ -190,7 +196,7 @@ function Item.Refresh(button)
end

button.overlay:Show()
button.overlay:SetTexture("Interface\\Common\\WhiteIconFrame")
button.overlay:SetTexture(WHITE_ICON_FRAME)
button.overlay:SetAtlas(LOOT_BORDER_BY_QUALITY[itemQuality] or LOOT_BORDER_BY_QUALITY[LE_ITEM_QUALITY_UNCOMMON])
if not LOOT_BORDER_BY_QUALITY[itemQuality] then
button.overlay:SetDesaturated(true)
Expand All @@ -212,14 +218,16 @@ function Item.Refresh(button)
-- ##################
-- description
-- ##################
button.extra:SetText(Token.GetTokenDescription(button.ItemID) or GetItemDescInfo(itemEquipLoc, itemType, itemSubType))
button.extra:SetText(Token.GetTokenDescription(button.ItemID) or Recipe.GetRecipeDescription(button.ItemID) or GetItemDescInfo(itemEquipLoc, itemType, itemSubType))
end
--[[
if db.showCompletedHook then
local itemCount = GetItemCount(button.ItemString, true)
if itemCount and itemCount > 0 then
button.completed:Show()
end
end
]]--

return true
end
Expand Down
Empty file added AtlasLootClassic/Data/Profession.lua
View file
Empty file.
890 changes: 890 additions & 0 deletions AtlasLootClassic/Data/Recipe.lua
View file

Large diffs are not rendered by default.

90 changes: 45 additions & 45 deletions AtlasLootClassic/Data/Token.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,48 +37,48 @@ local TOKEN = {

--- Darkmoon cards
-- Portals / Darkmoon Card: Twisting Nether
[19277] = { 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284, 0, 19277, 19290 }, -- Portals Deck
[19276] = { 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284, 0, 19277, 19290 }, -- Ace of Portals
[19278] = { 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284, 0, 19277, 19290 }, -- Two of Portals
[19279] = { 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284, 0, 19277, 19290 }, -- Three of Portals
[19280] = { 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284, 0, 19277, 19290 }, -- Four of Portals
[19281] = { 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284, 0, 19277, 19290 }, -- Five of Portals
[19282] = { 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284, 0, 19277, 19290 }, -- Six of Portals
[19283] = { 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284, 0, 19277, 19290 }, -- Seven of Portals
[19284] = { 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284, 0, 19277, 19290 }, -- Eight of Portals
[19277] = { 19277, 19290, 0, 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284 }, -- Portals Deck
[19276] = { 19277, 19290, 0, 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284 }, -- Ace of Portals
[19278] = { 19277, 19290, 0, 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284 }, -- Two of Portals
[19279] = { 19277, 19290, 0, 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284 }, -- Three of Portals
[19280] = { 19277, 19290, 0, 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284 }, -- Four of Portals
[19281] = { 19277, 19290, 0, 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284 }, -- Five of Portals
[19282] = { 19277, 19290, 0, 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284 }, -- Six of Portals
[19283] = { 19277, 19290, 0, 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284 }, -- Seven of Portals
[19284] = { 19277, 19290, 0, 19276, 19278, 19279, 19280, 19281, 19282, 19283, 19284 }, -- Eight of Portals

-- Elementals / Darkmoon Card: Maelstrom
[19267] = { 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275, 0, 19267, 19289 }, -- Elementals Deck
[19268] = { 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275, 0, 19267, 19289 }, -- Ace of Elementals
[19269] = { 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275, 0, 19267, 19289 }, -- Two of Elementals
[19270] = { 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275, 0, 19267, 19289 }, -- Three of Elementals
[19271] = { 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275, 0, 19267, 19289 }, -- Four of Elementals
[19272] = { 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275, 0, 19267, 19289 }, -- Five of Elementals
[19273] = { 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275, 0, 19267, 19289 }, -- Six of Elementals
[19274] = { 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275, 0, 19267, 19289 }, -- Seven of Elementals
[19275] = { 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275, 0, 19267, 19289 }, -- Eight of Elementals
[19267] = { 19267, 19289, 0, 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275 }, -- Elementals Deck
[19268] = { 19267, 19289, 0, 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275 }, -- Ace of Elementals
[19269] = { 19267, 19289, 0, 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275 }, -- Two of Elementals
[19270] = { 19267, 19289, 0, 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275 }, -- Three of Elementals
[19271] = { 19267, 19289, 0, 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275 }, -- Four of Elementals
[19272] = { 19267, 19289, 0, 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275 }, -- Five of Elementals
[19273] = { 19267, 19289, 0, 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275 }, -- Six of Elementals
[19274] = { 19267, 19289, 0, 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275 }, -- Seven of Elementals
[19275] = { 19267, 19289, 0, 19268, 19269, 19270, 19271, 19272, 19273, 19274, 19275 }, -- Eight of Elementals

-- Warlords / Darkmoon Card: Heroism
[19257] = { 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265, 0, 19257, 19287 }, -- Warlords Deck
[19258] = { 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265, 0, 19257, 19287 }, -- Ace of Warlords
[19259] = { 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265, 0, 19257, 19287 }, -- Two of Warlords
[19260] = { 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265, 0, 19257, 19287 }, -- Three of Warlords
[19261] = { 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265, 0, 19257, 19287 }, -- Four of Warlords
[19262] = { 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265, 0, 19257, 19287 }, -- Five of Warlords
[19263] = { 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265, 0, 19257, 19287 }, -- Six of Warlords
[19264] = { 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265, 0, 19257, 19287 }, -- Seven of Warlords
[19265] = { 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265, 0, 19257, 19287 }, -- Eight of Warlords
[19257] = { 19257, 19287, 0, 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265 }, -- Warlords Deck
[19258] = { 19257, 19287, 0, 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265 }, -- Ace of Warlords
[19259] = { 19257, 19287, 0, 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265 }, -- Two of Warlords
[19260] = { 19257, 19287, 0, 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265 }, -- Three of Warlords
[19261] = { 19257, 19287, 0, 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265 }, -- Four of Warlords
[19262] = { 19257, 19287, 0, 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265 }, -- Five of Warlords
[19263] = { 19257, 19287, 0, 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265 }, -- Six of Warlords
[19264] = { 19257, 19287, 0, 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265 }, -- Seven of Warlords
[19265] = { 19257, 19287, 0, 19258, 19259, 19260, 19261, 19262, 19263, 19264, 19265 }, -- Eight of Warlords

-- Beasts / Darkmoon Card: Blue Dragon
[19257] = { 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236, 0, 19228, 19288 }, -- Beasts Deck
[19227] = { 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236, 0, 19228, 19288 }, -- Ace of Beasts
[19230] = { 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236, 0, 19228, 19288 }, -- Two of Beasts
[19231] = { 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236, 0, 19228, 19288 }, -- Three of Beasts
[19232] = { 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236, 0, 19228, 19288 }, -- Four of Beasts
[19233] = { 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236, 0, 19228, 19288 }, -- Five of Beasts
[19234] = { 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236, 0, 19228, 19288 }, -- Six of Beasts
[19235] = { 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236, 0, 19228, 19288 }, -- Seven of Beasts
[19236] = { 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236, 0, 19228, 19288 }, -- Eight of Beasts
[19257] = { 19228, 19288, 0, 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236 }, -- Beasts Deck
[19227] = { 19228, 19288, 0, 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236 }, -- Ace of Beasts
[19230] = { 19228, 19288, 0, 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236 }, -- Two of Beasts
[19231] = { 19228, 19288, 0, 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236 }, -- Three of Beasts
[19232] = { 19228, 19288, 0, 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236 }, -- Four of Beasts
[19233] = { 19228, 19288, 0, 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236 }, -- Five of Beasts
[19234] = { 19228, 19288, 0, 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236 }, -- Six of Beasts
[19235] = { 19228, 19288, 0, 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236 }, -- Seven of Beasts
[19236] = { 19228, 19288, 0, 19227, 19230, 19231, 19232, 19233, 19234, 19235, 19236 }, -- Eight of Beasts

-- Zul'Gurub
[19724] = { 19841, 19834, 19831 }, -- Primal Hakkari Aegis
Expand Down Expand Up @@ -149,15 +149,15 @@ local TOKEN = {
[12033] = { 7910, 1529, 7909, 12361, 1705, 12799, 7971, 5500, 12800, 1206, 12364, type = 2 }, -- Thaurissan Family Jewels

-- Misc
[11086] = { 9379, 9372 }, -- Jang'thraze the Protector
[9379] = { 11086, 9372 }, -- Sang'thraze the Deflector
[18784] = { 18783, 12725, 16742 }, -- Top Half of Advanced Armorsmithing: Volume III
[18783] = { 18784, 12725, 16742 }, -- Bottom Half of Advanced Armorsmithing: Volume III
[18780] = { 18779, 12727, 12618 }, -- Pristine Hide of the Beast
[18779] = { 18780, 12727, 12618 }, -- Top Half of Advanced Armorsmithing: Volume I
[12731] = { 12752, 12757, 12756 }, -- Bottom Half of Advanced Armorsmithing: Volume I
[18782] = { 18781, 12726, 12619 }, -- Top Half of Advanced Armorsmithing: Volume II
[18781] = { 18782, 12726, 12619 }, -- Bottom Half of Advanced Armorsmithing: Volume II
[11086] = { 9372, 0, 9379, 11086 }, -- Jang'thraze the Protector
[9379] = { 9372, 0, 9379, 11086 }, -- Sang'thraze the Deflector
[18784] = { 12725, 0, 18783, 18784 }, -- Top Half of Advanced Armorsmithing: Volume III
[18783] = { 12725, 0, 18783, 18784 }, -- Bottom Half of Advanced Armorsmithing: Volume III
[18780] = { 12727, 0, 18779, 18780 }, -- Top Half of Advanced Armorsmithing: Volume I
[18779] = { 12727, 0, 18779, 18780 }, -- Bottom Half of Advanced Armorsmithing: Volume I
[12731] = { 12752, 12757, 12756 }, -- Pristine Hide of the Beast
[18782] = { 12726, 0, 18781, 18782 }, -- Top Half of Advanced Armorsmithing: Volume II
[18781] = { 12726, 0, 18781, 18782 }, -- Bottom Half of Advanced Armorsmithing: Volume II


-- Quests
Expand Down
7 changes: 6 additions & 1 deletion AtlasLootClassic/Documentation/Release_Notes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ This mod is distributed under Version 2 of the GPL. A copy of the GPL is includ

Patch Notes

v1.0.0-beta3 (Jul. XX, 2019)
========================
- Add Recipe database
- Fix order of some Tokens with added multiline support
- Remove double entries that are no longer needed with recipe db

v1.0.0-beta2 (Jul. 09, 2019)
========================
- Add much more Tokens and expand their usage
Expand All @@ -19,7 +25,6 @@ v1.0.0-beta1 (Jul. 08, 2019)
- Add better icons for Sets
- Fix bug with item description and rename "Junk"


v1.0.0-beta0 (Jul. 07, 2019)
========================
- First upload of Classic version
Loading

0 comments on commit e2cbfb2

Please sign in to comment.