Skip to content

Commit

Permalink
Fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@IrcDirk
IrcDirk committed Jan 15, 2023
1 parent bc838cc commit 85ae2ee
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 156 deletions.
173 changes: 32 additions & 141 deletions Carbonite/Carbonite.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,35 +536,36 @@ Nx.BrokerMenuTemplate = {
local menuFrame = CreateFrame("Frame", "CarboniteMenuFrame", UIParent, "UIDropDownMenuTemplate")

Nx.Broker = LibStub("LibDataBroker-1.1"):NewDataObject("Broker_Carbonite", {
type = "data source",
icon = "Interface\\AddOns\\Carbonite\\Gfx\\MMBut",
label = "Carbonite",
text = "Carbonite",
OnTooltipShow = function(tooltip)
if not tooltip or not tooltip.AddLine then return end
tooltip:AddLine("Carbonite")
tooltip:AddLine(L["Left-Click to Toggle Map"])
if Nx.db.profile.MiniMap.ButOwn then
tooltip:AddLine(L["Shift Left-Click to Toggle Minimize"])
end
tooltip:AddLine(L["Middle-Click to Toggle Guide"])
tooltip:AddLine(L["Right-Click for Menu"])
end,
OnClick = function(frame, msg)
if msg == "LeftButton" then
if (IsShiftKeyDown()) then
Nx.db.profile.MiniMap.ButWinMinimize = not Nx.db.profile.MiniMap.ButWinMinimize
Nx.Map.Dock:UpdateOptions()
else
Nx.Map:ToggleSize(0)
end
elseif msg == "MiddleButton" then
Nx.Map:GetMap(1).Guide:ToggleShow()
elseif msg == "RightButton" then
EasyMenu(Nx.BrokerMenuTemplate, menuFrame, "cursor", 0, 0, "MENU")
end
end,
})
type = "data source",
icon = "Interface\\AddOns\\Carbonite\\Gfx\\MMBut",
label = "Carbonite",
text = "Carbonite",
OnTooltipShow = function(tooltip)
if not tooltip or not tooltip.AddLine then return end
tooltip:AddLine("Carbonite")
tooltip:AddLine(L["Left-Click to Toggle Map"])
if Nx.db.profile.MiniMap.ButOwn then
tooltip:AddLine(L["Shift Left-Click to Toggle Minimize"])
end
tooltip:AddLine(L["Middle-Click to Toggle Guide"])
tooltip:AddLine(L["Right-Click for Menu"])
end,
OnClick = function(frame, msg)
if msg == "LeftButton" then
if (IsShiftKeyDown()) then
Nx.db.profile.MiniMap.ButWinMinimize = not Nx.db.profile.MiniMap.ButWinMinimize
Nx.Map.Dock:UpdateOptions()
else
Nx.Map:ToggleSize(0)
end
elseif msg == "MiddleButton" then
Nx.Map:GetMap(1).Guide:ToggleShow()
elseif msg == "RightButton" then
EasyMenu(Nx.BrokerMenuTemplate, menuFrame, "cursor", 0, 0, "MENU")
end
end,
})

function Nx:OnInitialize()
local ver = GetBuildInfo()
local v1, v2, v3 = Nx.Split (".", ver)
Expand Down Expand Up @@ -1357,6 +1358,7 @@ function Nx:NXOnUpdate (elapsed)
Nx.Warehouse:RecordCharacter()
end
end

--[[if Nx.WhatsNewUnread() then
if Nx.Tick % 50 == 0 then
if Nx.GlowOn then
Expand Down Expand Up @@ -1509,7 +1511,6 @@ function Nx:ShowMessage (msg, func1Txt, func1, func2Txt, func2)
local pop = StaticPopupDialogs["NxMsg"]

if not pop then

pop = {
["whileDead"] = 1,
["hideOnEscape"] = 1,
Expand Down Expand Up @@ -2853,44 +2854,6 @@ Nx.GatherInfo = {
{ 435, "inv_misc_herb_icethorn",L["Icethorn"]},
{ 450, "inv_misc_herb_frostlotus",L["Frost Lotus"]},
{ 360, "inv_misc_herb_11a",L["Firethorn"]},
--[[
{ 425, "inv_misc_herb_azsharasveil",L["Azshara's Veil"]},
{ 425, "inv_misc_herb_cinderbloom",L["Cinderbloom"]},
{ 425, "inv_misc_herb_stormvine",L["Stormvine"]},
{ 475, "inv_misc_herb_heartblossom",L["Heartblossom"]},
{ 500, "inv_misc_herb_whiptail",L["Whiptail"]},
{ 525, "inv_misc_herb_twilightjasmine",L["Twilight Jasmine"]},
{ 600, "inv_misc_herb_foolscap",L["Fool's Cap"]},
{ 550, "inv_misc_herb_goldenlotus",L["Golden Lotus"]},
{ 500, "inv_misc_herb_jadetealeaf",L["Green Tea Leaf"]},
{ 525, "inv_misc_herb_rainpoppy",L["Rain Poppy"]},
{ 575, "inv_misc_herb_shaherb",L["Sha-Touched Herb"]},
{ 545, "inv_misc_herb_silkweed",L["Silkweed"]},
{ 575, "inv_misc_herb_snowlily",L["Snow Lily"]},
{ 600, "inv_misc_herb_chamlotus",L["Chameleon Lotus"]},
{ 600, "inv_misc_herb_frostweed",L["Frostweed"]},
{ 600, "inv_misc_herb_flytrap",L["Gorgrond Flytrap"]},
{ 600, "inv_misc_herb_starflower",L["Starflower"]},
{ 600, "inv_misc_herb_arrowbloom",L["Nagrand Arrowbloom"]},
{ 600, "inv_misc_herb_taladororchid",L["Talador Orchid"]},
{ 600, "inv_misc_herb_fireweed",L["Fireweed"]},
{ 600, "inv_farm_pumpkinseed_yellow",L["Withered Herb"]},
{ 700, "inv_herbalism_70_aethril",L["Aethril"]},
{ 700, "inv_herbalism_70_dreamleaf",L["Dreamleaf"]},
{ 700, "inv_herbalism_70_felwort",L["Felwort"]},
{ 700, "inv_herbalism_70_fjarnskaggl",L["Fjarnskaggl"]},
{ 700, "inv_herbalism_70_foxflower",L["Foxflower"]},
{ 700, "inv_herbalism_70_starlightrosepetals",L["Starlight Rose"]},
{ 700, "inv_misc_herb_astralglory",L["Astral Glory"]},
-- BfA
{ 700, "inv_misc_herb_akundasbite",L["Akunda's Bite"]},
{ 700, "inv_misc_herb_anchorweed",L["Anchor Weed"]},
{ 700, "inv_misc_herb_riverbud",L["Riverbud"]},
{ 700, "inv_misc_herb_seastalk",L["Sea Stalks"]},
{ 700, "inv_misc_herb_pollen",L["Siren's Sting"]},
{ 700, "inv_misc_herb_starmoss",L["Star Moss"]},
{ 700, "inv_misc_herb_winterskiss",L["Winter's Kiss"]},
]]--
},
["M"] = { -- Mine node
{ 325, "inv_ore_adamantium",L["Adamantite Deposit"]},
Expand Down Expand Up @@ -2918,44 +2881,7 @@ Nx.GatherInfo = {
{ 375, "inv_ore_cobalt",L["Rich Cobalt Deposit"]},
{ 425, "inv_ore_saronite_01",L["Saronite Deposit"]},
{ 425, "inv_ore_saronite_01",L["Rich Saronite Deposit"]},
{ 450, "inv_ore_platinum_01",L["Titanium Vein"]},
--[[
{ 425, "item_elementiumore",L["Obsidium Deposit"]},
{ 450, "item_elementiumore",L["Rich Obsidium Deposit"]},
{ 475, "item_pyriumore",L["Elementium Vein"]},
{ 500, "item_pyriumore",L["Rich Elementium Vein"]},
{ 525, "inv_ore_arcanite_01",L["Pyrite Deposit"]},
{ 525, "inv_ore_arcanite_01",L["Rich Pyrite Deposit"]},
{ 515, "inv_ore_ghostiron",L["Ghost Iron Deposit"]},
{ 550, "inv_ore_ghostiron",L["Rich Ghost Iron Deposit"]},
{ 550, "inv_ore_manticyte",L["Kyparite Deposit"]},
{ 575, "inv_ore_manticyte",L["Rich Kyparite Deposit"]},
{ 600, "inv_ore_trilliumwhite",L["Trillium Vein"]},
{ 600, "inv_ore_trilliumWhite",L["Rich Trillium Vein"]},
{ 600, "inv_ore_trueironore",L["Rich True Iron Deposit"]},
{ 600, "inv_ore_trueironore",L["Smoldering True Iron Deposit"]},
{ 600, "inv_ore_trueironore",L["True Iron Deposit"]},
{ 600, "inv_ore_blackrock_ore",L["Blackrock Deposit"]},
{ 600, "inv_ore_blackrock_ore",L["Rich Blackrock Deposit"]},
{ 700, "inv_felslate",L["Felslate Deposit"]},
{ 700, "inv_felslate",L["Felslate Seam"]},
{ 700, "inv_felslate",L["Living Felslate"]},
{ 700, "inv_leystone",L["Leystone Deposit"]},
{ 700, "inv_leystone",L["Leystone Seam"]},
{ 700, "inv_leystone",L["Living Leystone"]},
{ 700, "inv_misc_starmetal",L["Empyrium Deposit"]},
{ 700, "inv_misc_starmetal",L["Rich Empyrium Deposit"]},
{ 700, "inv_misc_starmetal",L["Empyrium Seam"]},
-- BfA
{ 800, "inv_ore_monalite",L["Monelite Deposit"]},
{ 800, "inv_ore_monalite",L["Rich Monelite Deposit"]},
{ 800, "inv_ore_monalite",L["Monelite Seam"]},
{ 800, "inv_ore_platinum",L["Platinum Deposit"]},
{ 800, "inv_ore_platinum",L["Rich Platinum Deposit"]},
{ 800, "inv_ore_stormsilver",L["Storm Silver Deposit"]},
{ 800, "inv_ore_stormsilver",L["Rich Storm Silver Deposit"]},
{ 800, "inv_ore_stormsilver",L["Storm Silver Seam"]},
]]--
{ 450, "inv_ore_platinum_01",L["Titanium Vein"]},
}
}

Expand Down Expand Up @@ -3217,25 +3143,6 @@ function Nx:GatherNodeToCarb (id)
[250] = 40,
[251] = 42,
[252] = 43,
-- Legion
[253] = 47,
[254] = 49,
[255] = 48,
[256] = 44,
[257] = 46,
[258] = 45,
[259] = 50, -- guessing at this logically, needs confirmation after 7.3 release, regular node
[260] = 51, -- rich deposit
[261] = 52, -- seam
-- BfA
[262] = 53,
[263] = 54,
[264] = 55,
[265] = 56,
[266] = 57,
[267] = 58,
[268] = 59,
[269] = 60,
-- Herbalism Nodes
[401] = 30,
[402] = 34,
Expand Down Expand Up @@ -3312,22 +3219,6 @@ function Nx:GatherNodeToCarb (id)
[473] = 69,
[474] = 64,
[475] = 70,
-- Legion
[476] = 71,
[477] = 72,
[478] = 73,
[479] = 74,
[480] = 75,
[481] = 76,
[482] = 77,
-- BfA
[485] = 78,
[486] = 79,
[487] = 80,
[488] = 81,
[489] = 82,
[490] = 83,
[491] = 84,
}
return gatherIDs[id]
end
Expand Down
15 changes: 0 additions & 15 deletions Carbonite/NxMap.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1541,21 +1541,6 @@ function Nx.Map:UpdateWorldMap()
v:SetScale (.001)
end
end
--[[if not InCombatLockdown() then
self.Arch:DrawNone();
if Nx.db.char.Map.ShowArchBlobs then
for i = 1, ArchaeologyMapUpdateAll(Nx.Map:GetCurrentMapAreaID()) do
self.Arch:DrawBlob(ArcheologyGetVisibleBlobID(i), true)
end
self:ClipZoneFrm( self.Cont, self.Zone, self.Arch, 1 )
self.Arch:SetFrameLevel(self.Level)
self.Arch:SetFillAlpha(255 * self.ArchAlpha)
self.Arch:SetBorderAlpha( 255 * self.ArchAlpha )
self.Arch:Show()
else
self.Arch:Hide()
end
end]]--
end

--------
Expand Down

0 comments on commit 85ae2ee

Please sign in to comment.