Code format

This commit is contained in:
2025-05-15 20:37:50 +02:00
parent 9e6432d0b0
commit 69d1f9fd93
105 changed files with 24069 additions and 28084 deletions

View File

@@ -1,4 +1,4 @@
globals = { "CykaPersistentData", "CreateFrame", "GetItemInfo" } globals = { "CykaPersistentData", "CreateFrame", "GetItemInfo", "aura_env" }
unused_args = false unused_args = false
max_line_length = 150 max_line_length = 150
exclude_files = { "Meta/" } exclude_files = { "Meta/" }

View File

@@ -7,5 +7,8 @@
"diagnostics.disable": [ "diagnostics.disable": [
"unused-local", "unused-local",
"unused-vararg" "unused-vararg"
],
"diagnostics.globals": [
"aura_env"
] ]
} }

View File

@@ -19,7 +19,7 @@ local dataSet2s = {
[13] = 540414375.1427, [13] = 540414375.1427,
[14] = 540416373.0995, [14] = 540416373.0995,
[15] = 540418376.9931, [15] = 540418376.9931,
[16]=540420390.6971 [16] = 540420390.6971,
} }
local dataSet1p5s = { local dataSet1p5s = {
[1] = 541651364.1916, [1] = 541651364.1916,
@@ -37,7 +37,7 @@ local dataSet1p5s = {
[13] = 541669343.2332, [13] = 541669343.2332,
[14] = 541670849.9777, [14] = 541670849.9777,
[15] = 541672344.0613, [15] = 541672344.0613,
[16]=541673851.2346 [16] = 541673851.2346,
} }
local tolerance = 50 local tolerance = 50
local tempAverages = {} local tempAverages = {}
@@ -45,7 +45,10 @@ local tempAverages = {}
for k, v in ipairs(dataSet1p5s) do for k, v in ipairs(dataSet1p5s) do
if k > 1 then if k > 1 then
local tempAvg = (dataSet1p5s[k] - dataSet1p5s[k - 1]) local tempAvg = (dataSet1p5s[k] - dataSet1p5s[k - 1])
print(((math.floor(tempAvg / 1000) - (tempAvg / 1000)) * 1000), (math.ceil(tempAvg / 1000) - (tempAvg / 1000)) * 1000) print(
((math.floor(tempAvg / 1000) - (tempAvg / 1000)) * 1000),
(math.ceil(tempAvg / 1000) - (tempAvg / 1000)) * 1000
)
if not tempAverages[tempAvg] then tempAverages[tempAvg] = 0 end if not tempAverages[tempAvg] then tempAverages[tempAvg] = 0 end
tempAverages[tempAvg] = tempAverages[tempAvg] + 1 tempAverages[tempAvg] = tempAverages[tempAvg] + 1
end end

View File

@@ -4,48 +4,38 @@ local popupText = "Wowhead %s Link\n" .. keybind .. " to copy"
local typeAttributeMap = { local typeAttributeMap = {
quest = { "id", "questId", "questID" }, quest = { "id", "questId", "questID" },
item = {info = {"id"}} item = { info = { "id" } },
} }
local function ShowUrlPopup(id, type) local function ShowUrlPopup(id, type)
if not (id or type) then return end if not (id or type) then return end
local url = baseUrl .. type .. "=" .. id local url = baseUrl .. type .. "=" .. id
StaticPopup_Show("WowheadQuestLinkUrl", type:sub(1, 1):upper() .. type:sub(2), _, url) StaticPopup_Show("WowheadQuestLinkUrl", type:sub(1, 1):upper() .. type:sub(2), _, url)
end end
local function getIdAndType(focus) local function getIdAndType(focus)
local function loop(focus, keys) local function loop(focus, keys)
if not focus then return end if not focus then return end
for key, value in pairs(keys) do for key, value in pairs(keys) do
if type(value) == "table" then if type(value) == "table" then return loop(focus[key], value) end
return loop(focus[key], value)
end
local id = focus[value] local id = focus[value]
if id then if id then return id end
return id
end
end end
end end
if not focus then return end if not focus then return end
for type, keys in pairs(typeAttributeMap) do for type, keys in pairs(typeAttributeMap) do
local id = loop(focus, keys) local id = loop(focus, keys)
if id then if id then return id, type end
return id, type
end
end end
return getIdAndType(focus:GetParent()) return getIdAndType(focus:GetParent())
end end
local function run() local function run()
local focus = GetMouseFocus() local focus = GetMouseFocus()
local id, type = getIdAndType(focus) local id, type = getIdAndType(focus)
ShowUrlPopup(id, type) ShowUrlPopup(id, type)
end end
StaticPopupDialogs["WowheadQuestLinkUrl"] = { StaticPopupDialogs["WowheadQuestLinkUrl"] = {
text = popupText, text = popupText,
button1 = "Close", button1 = "Close",
@@ -65,8 +55,6 @@ StaticPopupDialogs["WowheadQuestLinkUrl"] = {
preferredIndex = 3, preferredIndex = 3,
} }
local btn = CreateFrame("BUTTON", "KeybindBtn") local btn = CreateFrame("BUTTON", "KeybindBtn")
SetBindingClick(keybind, btn:GetName()) SetBindingClick(keybind, btn:GetName())
btn:SetScript("OnClick", run) btn:SetScript("OnClick", run)

View File

@@ -9,17 +9,21 @@ function aa()
end end
-- TRIGGER -- TRIGGER
function bb() function bb()
if UnitDebuff("focus", "Paralytic Poison") or if
UnitDebuff("focus", "Partial Paralysis") or UnitDebuff("focus", "Paralytic Poison")
UnitDebuff("focus", "Paralysis") then -- application for stun or UnitDebuff("focus", "Partial Paralysis")
or UnitDebuff("focus", "Paralysis")
then -- application for stun
return true return true
end end
end end
-- UNTRIGGER -- UNTRIGGER
function cc() function cc()
if UnitDebuff("focus", "Paralytic Poison") == nil and if
UnitDebuff("focus", "Partial Paralysis") == nil and UnitDebuff("focus", "Paralytic Poison") == nil
UnitDebuff("focus", "Paralysis") == nil then -- application for stun and UnitDebuff("focus", "Partial Paralysis") == nil
and UnitDebuff("focus", "Paralysis") == nil
then -- application for stun
return true return true
end end
end end

View File

@@ -59,12 +59,8 @@ local function myChatFilter(self, e, msg, author, lang)
local month = date:match("(%d%d)") --(01)/07/19 14:36:42 local month = date:match("(%d%d)") --(01)/07/19 14:36:42
local day = date:match("%d%d%/(%d%d)") --01/(07)/19 14:36:42 local day = date:match("%d%d%/(%d%d)") --01/(07)/19 14:36:42
--Remove first place zeros --Remove first place zeros
if day:find("0") == 1 then if day:find("0") == 1 then day = day:gsub("0", "") end
day = day:gsub("0", "") if month:find("0") == 1 then month = month:gsub("0", "") end
end
if month:find("0") == 1 then
month = month:gsub("0", "")
end
local localdate = day .. "." .. month .. "." .. year local localdate = day .. "." .. month .. "." .. year
return localdate return localdate
end end
@@ -80,7 +76,8 @@ local function myChatFilter(self, e, msg, author, lang)
--Remove Alliance --Remove Alliance
if lang == "Common" then if lang == "Common" then
-- print("Caught one!") -- print("Caught one!")
ChatFilter.RemovedCommon[#ChatFilter.RemovedCommon + 1] = format("\[%s\]\[%s\]%s: %s", getDate(), getTime(), author, msg) ChatFilter.RemovedCommon[#ChatFilter.RemovedCommon + 1] =
format("[%s][%s]%s: %s", getDate(), getTime(), author, msg)
return true return true
end end
@@ -88,9 +85,15 @@ local function myChatFilter(self, e, msg, author, lang)
for k, v in pairs(ChatFilter.People) do for k, v in pairs(ChatFilter.People) do
if author == v then if author == v then
if e == "CHAT_MSG_WHISPER" and author ~= UnitName("player") then if e == "CHAT_MSG_WHISPER" and author ~= UnitName("player") then
SendChatMessage(format("Your message \"%s\" has been filtered out because I hate fun", msg), "WHISPER", nil, author) SendChatMessage(
format('Your message "%s" has been filtered out because I hate fun', msg),
"WHISPER",
nil,
author
)
end end
ChatFilter.RemovedLines[#ChatFilter.RemovedLines + 1] = format("\[%s\]\[%s\]%s: %s", getDate(), getTime(), author, msg) ChatFilter.RemovedLines[#ChatFilter.RemovedLines + 1] =
format("[%s][%s]%s: %s", getDate(), getTime(), author, msg)
-- print("Caught one!") -- print("Caught one!")
return true return true
end end
@@ -100,9 +103,15 @@ local function myChatFilter(self, e, msg, author, lang)
for k, v in pairs(ChatFilter.Words) do for k, v in pairs(ChatFilter.Words) do
if msg:match(v) then if msg:match(v) then
if e == "CHAT_MSG_WHISPER" and author ~= UnitName("player") then if e == "CHAT_MSG_WHISPER" and author ~= UnitName("player") then
SendChatMessage(format("Your message \"%s\" has been filtered out because I hate fun", msg), "WHISPER", nil, author) SendChatMessage(
format('Your message "%s" has been filtered out because I hate fun', msg),
"WHISPER",
nil,
author
)
end end
ChatFilter.RemovedLines[#ChatFilter.RemovedLines + 1] = format("\[%s\]\[%s\]%s: %s", getDate(), getTime(), author, msg) ChatFilter.RemovedLines[#ChatFilter.RemovedLines + 1] =
format("[%s][%s]%s: %s", getDate(), getTime(), author, msg)
-- print("Caught one!") -- print("Caught one!")
return true return true
end end
@@ -119,9 +128,7 @@ local function cleanse()
end end
end end
print("Done?") print("Done?")
if ChatFrame_GetMessageEventFilters(v) then if ChatFrame_GetMessageEventFilters(v) then print(unpack(ChatFrame_GetMessageEventFilters(v))) end
print(unpack(ChatFrame_GetMessageEventFilters(v)))
end
print("Got it.") print("Got it.")
end end
end end

View File

@@ -59,7 +59,7 @@ aura_env.GetClosestHerb = function()
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = -1 ["ID"] = -1,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0
@@ -79,4 +79,7 @@ aura_env.GetClosestHerb = function()
end end
return aura_env.minID.ID return aura_env.minID.ID
end end
if WeakAuras.IsOptionsOpen() then WeakAurasSaved.HerbSniffer.CD = 0; WeakAurasSaved.HerbSniffer.NoCD = #aura_env.herbs end if WeakAuras.IsOptionsOpen() then
WeakAurasSaved.HerbSniffer.CD = 0
WeakAurasSaved.HerbSniffer.NoCD = #aura_env.herbs
end

File diff suppressed because it is too large Load Diff

View File

@@ -1,503 +1,420 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 39.26, ["X"] = 39.26,
["Y"] = 49.83, ["Y"] = 49.83,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 37.03, ["X"] = 37.03,
["Y"] = 50.59, ["Y"] = 50.59,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 28.08, ["X"] = 28.08,
["Y"] = 56.13, ["Y"] = 56.13,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 29.49, ["X"] = 29.49,
["Y"] = 55.41, ["Y"] = 55.41,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 30.68, ["X"] = 30.68,
["Y"] = 54.32, ["Y"] = 54.32,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 35.43, ["X"] = 35.43,
["Y"] = 50.28, ["Y"] = 50.28,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 36.67, ["X"] = 36.67,
["Y"] = 48.79, ["Y"] = 48.79,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 38.25, ["X"] = 38.25,
["Y"] = 48.17, ["Y"] = 48.17,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 46.08, ["X"] = 46.08,
["Y"] = 23.02, ["Y"] = 23.02,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 45.35, ["X"] = 45.35,
["Y"] = 21.67, ["Y"] = 21.67,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 44.45, ["X"] = 44.45,
["Y"] = 20.35, ["Y"] = 20.35,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 45.48, ["X"] = 45.48,
["Y"] = 19.74, ["Y"] = 19.74,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 46.97, ["X"] = 46.97,
["Y"] = 18.39, ["Y"] = 18.39,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 47.91, ["X"] = 47.91,
["Y"] = 17.92, ["Y"] = 17.92,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 49.28, ["X"] = 49.28,
["Y"] = 19.47, ["Y"] = 19.47,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 50.02, ["X"] = 50.02,
["Y"] = 21.88, ["Y"] = 21.88,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 50.97, ["X"] = 50.97,
["Y"] = 23.78, ["Y"] = 23.78,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 57.33, ["X"] = 57.33,
["Y"] = 24.33, ["Y"] = 24.33,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 52.96, ["X"] = 52.96,
["Y"] = 28.43, ["Y"] = 28.43,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 53.04, ["X"] = 53.04,
["Y"] = 26.47, ["Y"] = 26.47,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 54.27, ["X"] = 54.27,
["Y"] = 25.68, ["Y"] = 25.68,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 55.57, ["X"] = 55.57,
["Y"] = 26, ["Y"] = 26,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 54.52, ["X"] = 54.52,
["Y"] = 26.35, ["Y"] = 26.35,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 53.71, ["X"] = 53.71,
["Y"] = 27.51, ["Y"] = 27.51,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 53.92, ["X"] = 53.92,
["Y"] = 30.54, ["Y"] = 30.54,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 53.84, ["X"] = 53.84,
["Y"] = 31.85, ["Y"] = 31.85,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 53.49, ["X"] = 53.49,
["Y"] = 33.43, ["Y"] = 33.43,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 54.42, ["X"] = 54.42,
["Y"] = 34.99, ["Y"] = 34.99,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 54.65, ["X"] = 54.65,
["Y"] = 37.19, ["Y"] = 37.19,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 54.78, ["X"] = 54.78,
["Y"] = 38.61, ["Y"] = 38.61,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 58.46, ["X"] = 58.46,
["Y"] = 42.74, ["Y"] = 42.74,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 59.89, ["X"] = 59.89,
["Y"] = 42.95, ["Y"] = 42.95,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 61.04, ["X"] = 61.04,
["Y"] = 43.6, ["Y"] = 43.6,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 62.82, ["X"] = 62.82,
["Y"] = 44.77, ["Y"] = 44.77,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 64.28, ["X"] = 64.28,
["Y"] = 47.39, ["Y"] = 47.39,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 65.46, ["X"] = 65.46,
["Y"] = 50.29, ["Y"] = 50.29,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 66.36, ["X"] = 66.36,
["Y"] = 51.96, ["Y"] = 51.96,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 67.58, ["X"] = 67.58,
["Y"] = 55.86, ["Y"] = 55.86,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 67.69, ["X"] = 67.69,
["Y"] = 57.08, ["Y"] = 57.08,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 66.7, ["X"] = 66.7,
["Y"] = 59.1, ["Y"] = 59.1,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 66.09, ["X"] = 66.09,
["Y"] = 61.15, ["Y"] = 61.15,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 65.52, ["X"] = 65.52,
["Y"] = 62.29, ["Y"] = 62.29,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 65.16, ["X"] = 65.16,
["Y"] = 62.99, ["Y"] = 62.99,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 45.97, ["X"] = 45.97,
["Y"] = 13.34, ["Y"] = 13.34,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 40.08, ["X"] = 40.08,
["Y"] = 15.91, ["Y"] = 15.91,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 41.09, ["X"] = 41.09,
["Y"] = 18.18, ["Y"] = 18.18,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 43.27, ["X"] = 43.27,
["Y"] = 19.12, ["Y"] = 19.12,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 44.76, ["X"] = 44.76,
["Y"] = 16.28, ["Y"] = 16.28,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 47.09, ["X"] = 47.09,
["Y"] = 16.2, ["Y"] = 16.2,
["CD"] = 0 ["CD"] = 0,
}, },
[50] = [50] = {
{
["X"] = 49.71, ["X"] = 49.71,
["Y"] = 18, ["Y"] = 18,
["CD"] = 0 ["CD"] = 0,
}, },
[51] = [51] = {
{
["X"] = 52.2, ["X"] = 52.2,
["Y"] = 18.56, ["Y"] = 18.56,
["CD"] = 0 ["CD"] = 0,
}, },
[52] = [52] = {
{
["X"] = 51.68, ["X"] = 51.68,
["Y"] = 21.51, ["Y"] = 21.51,
["CD"] = 0 ["CD"] = 0,
}, },
[53] = [53] = {
{
["X"] = 55.89, ["X"] = 55.89,
["Y"] = 40.14, ["Y"] = 40.14,
["CD"] = 0 ["CD"] = 0,
}, },
[54] = [54] = {
{
["X"] = 57.1, ["X"] = 57.1,
["Y"] = 41.6, ["Y"] = 41.6,
["CD"] = 0 ["CD"] = 0,
}, },
[55] = [55] = {
{
["X"] = 57.64, ["X"] = 57.64,
["Y"] = 41.94, ["Y"] = 41.94,
["CD"] = 0 ["CD"] = 0,
}, },
[56] = [56] = {
{
["X"] = 67.58, ["X"] = 67.58,
["Y"] = 52.38, ["Y"] = 52.38,
["CD"] = 0 ["CD"] = 0,
}, },
[57] = [57] = {
{
["X"] = 66.9, ["X"] = 66.9,
["Y"] = 54.24, ["Y"] = 54.24,
["CD"] = 0 ["CD"] = 0,
}, },
[58] = [58] = {
{
["X"] = 66.73, ["X"] = 66.73,
["Y"] = 56.48, ["Y"] = 56.48,
["CD"] = 0 ["CD"] = 0,
}, },
[59] = [59] = {
{
["X"] = 59.94, ["X"] = 59.94,
["Y"] = 67.07, ["Y"] = 67.07,
["CD"] = 0 ["CD"] = 0,
}, },
[60] = [60] = {
{
["X"] = 58.56, ["X"] = 58.56,
["Y"] = 67.12, ["Y"] = 67.12,
["CD"] = 0 ["CD"] = 0,
}, },
[61] = [61] = {
{
["X"] = 57.31, ["X"] = 57.31,
["Y"] = 67.5, ["Y"] = 67.5,
["CD"] = 0 ["CD"] = 0,
}, },
[62] = [62] = {
{
["X"] = 49.51, ["X"] = 49.51,
["Y"] = 58.28, ["Y"] = 58.28,
["CD"] = 0 ["CD"] = 0,
}, },
[63] = [63] = {
{
["X"] = 49.02, ["X"] = 49.02,
["Y"] = 57.03, ["Y"] = 57.03,
["CD"] = 0 ["CD"] = 0,
}, },
[64] = [64] = {
{
["X"] = 48.15, ["X"] = 48.15,
["Y"] = 55.84, ["Y"] = 55.84,
["CD"] = 0 ["CD"] = 0,
}, },
[65] = [65] = {
{
["X"] = 41.46, ["X"] = 41.46,
["Y"] = 49.57, ["Y"] = 49.57,
["CD"] = 0 ["CD"] = 0,
}, },
[66] = [66] = {
{
["X"] = 40, ["X"] = 40,
["Y"] = 48.65, ["Y"] = 48.65,
["CD"] = 0 ["CD"] = 0,
}, },
[67] = [67] = {
{
["X"] = 38.79, ["X"] = 38.79,
["Y"] = 48.34, ["Y"] = 48.34,
["CD"] = 0 ["CD"] = 0,
}, },
[68] = [68] = {
{
["X"] = 34.57, ["X"] = 34.57,
["Y"] = 51.11, ["Y"] = 51.11,
["CD"] = 0 ["CD"] = 0,
}, },
[69] = [69] = {
{
["X"] = 33.22, ["X"] = 33.22,
["Y"] = 52.3, ["Y"] = 52.3,
["CD"] = 0 ["CD"] = 0,
}, },
[70] = [70] = {
{
["X"] = 31.83, ["X"] = 31.83,
["Y"] = 53.23, ["Y"] = 53.23,
["CD"] = 0 ["CD"] = 0,
}, },
[71] = [71] = {
{
["X"] = 31.47, ["X"] = 31.47,
["Y"] = 53.57, ["Y"] = 53.57,
["CD"] = 0 ["CD"] = 0,
}, },
[72] = [72] = {
{
["X"] = 53.43, ["X"] = 53.43,
["Y"] = 18.24, ["Y"] = 18.24,
["CD"] = 0 ["CD"] = 0,
}, },
[73] = [73] = {
{
["X"] = 50.1, ["X"] = 50.1,
["Y"] = 11.22, ["Y"] = 11.22,
["CD"] = 0 ["CD"] = 0,
}, },
[74] = [74] = {
{
["X"] = 51.42, ["X"] = 51.42,
["Y"] = 23.49, ["Y"] = 23.49,
["CD"] = 0 ["CD"] = 0,
}, },
[75] = [75] = {
{
["X"] = 44.44, ["X"] = 44.44,
["Y"] = 13.95, ["Y"] = 13.95,
["CD"] = 0 ["CD"] = 0,
}, },
[76] = [76] = {
{
["X"] = 43.51, ["X"] = 43.51,
["Y"] = 17.14, ["Y"] = 17.14,
["CD"] = 0 ["CD"] = 0,
}, },
[77] = [77] = {
{
["X"] = 41.16, ["X"] = 41.16,
["Y"] = 49.52, ["Y"] = 49.52,
["CD"] = 0 ["CD"] = 0,
}, },
[78] = [78] = {
{
["X"] = 46.7, ["X"] = 46.7,
["Y"] = 53.95, ["Y"] = 53.95,
["CD"] = 0 ["CD"] = 0,
}, },
[79] = [79] = {
{
["X"] = 58.72, ["X"] = 58.72,
["Y"] = 67.38, ["Y"] = 67.38,
["CD"] = 0 ["CD"] = 0,
}, },
[80] = [80] = {
{
["X"] = 56.91, ["X"] = 56.91,
["Y"] = 41.1, ["Y"] = 41.1,
["CD"] = 0 ["CD"] = 0,
}, },
[81] = [81] = {
{
["X"] = 68.57, ["X"] = 68.57,
["Y"] = 51.75, ["Y"] = 51.75,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 50 aura_env.wipeDistance = 50
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,437 +1,365 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 55.83, ["X"] = 55.83,
["Y"] = 70.82, ["Y"] = 70.82,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 54.79, ["X"] = 54.79,
["Y"] = 69.62, ["Y"] = 69.62,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 54.46, ["X"] = 54.46,
["Y"] = 68.85, ["Y"] = 68.85,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 54.06, ["X"] = 54.06,
["Y"] = 67.47, ["Y"] = 67.47,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 53.67, ["X"] = 53.67,
["Y"] = 65.79, ["Y"] = 65.79,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 54.4, ["X"] = 54.4,
["Y"] = 64.58, ["Y"] = 64.58,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 55.43, ["X"] = 55.43,
["Y"] = 63.88, ["Y"] = 63.88,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 56.1, ["X"] = 56.1,
["Y"] = 64.35, ["Y"] = 64.35,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 56.57, ["X"] = 56.57,
["Y"] = 65.06, ["Y"] = 65.06,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 57.3, ["X"] = 57.3,
["Y"] = 65.21, ["Y"] = 65.21,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 58.88, ["X"] = 58.88,
["Y"] = 64.48, ["Y"] = 64.48,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 60.57, ["X"] = 60.57,
["Y"] = 63.9, ["Y"] = 63.9,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 61.47, ["X"] = 61.47,
["Y"] = 63.7, ["Y"] = 63.7,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 62.21, ["X"] = 62.21,
["Y"] = 63.3, ["Y"] = 63.3,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 63.2, ["X"] = 63.2,
["Y"] = 63.12, ["Y"] = 63.12,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 64.17, ["X"] = 64.17,
["Y"] = 62.56, ["Y"] = 62.56,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 65.08, ["X"] = 65.08,
["Y"] = 61.77, ["Y"] = 61.77,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 65.39, ["X"] = 65.39,
["Y"] = 60.16, ["Y"] = 60.16,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 65.57, ["X"] = 65.57,
["Y"] = 57.98, ["Y"] = 57.98,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 65.53, ["X"] = 65.53,
["Y"] = 55.56, ["Y"] = 55.56,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 64.44, ["X"] = 64.44,
["Y"] = 52.37, ["Y"] = 52.37,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 63.86, ["X"] = 63.86,
["Y"] = 50.96, ["Y"] = 50.96,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 63.14, ["X"] = 63.14,
["Y"] = 49.74, ["Y"] = 49.74,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 58.31, ["X"] = 58.31,
["Y"] = 47.48, ["Y"] = 47.48,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 56.2, ["X"] = 56.2,
["Y"] = 46.51, ["Y"] = 46.51,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 55.45, ["X"] = 55.45,
["Y"] = 47.13, ["Y"] = 47.13,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 55.15, ["X"] = 55.15,
["Y"] = 48.26, ["Y"] = 48.26,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 54.81, ["X"] = 54.81,
["Y"] = 49.21, ["Y"] = 49.21,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 55.15, ["X"] = 55.15,
["Y"] = 49.72, ["Y"] = 49.72,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 56.01, ["X"] = 56.01,
["Y"] = 50.37, ["Y"] = 50.37,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 56.01, ["X"] = 56.01,
["Y"] = 50.37, ["Y"] = 50.37,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 56.01, ["X"] = 56.01,
["Y"] = 50.37, ["Y"] = 50.37,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 57.26, ["X"] = 57.26,
["Y"] = 51.69, ["Y"] = 51.69,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 57.23, ["X"] = 57.23,
["Y"] = 53.17, ["Y"] = 53.17,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 57.06, ["X"] = 57.06,
["Y"] = 53.85, ["Y"] = 53.85,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 57.09, ["X"] = 57.09,
["Y"] = 54.24, ["Y"] = 54.24,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 56.75, ["X"] = 56.75,
["Y"] = 54.17, ["Y"] = 54.17,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 56.22, ["X"] = 56.22,
["Y"] = 53.84, ["Y"] = 53.84,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 55.69, ["X"] = 55.69,
["Y"] = 53.19, ["Y"] = 53.19,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 55.34, ["X"] = 55.34,
["Y"] = 53.27, ["Y"] = 53.27,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 54.31, ["X"] = 54.31,
["Y"] = 53.97, ["Y"] = 53.97,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 54.17, ["X"] = 54.17,
["Y"] = 53.51, ["Y"] = 53.51,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 53.38, ["X"] = 53.38,
["Y"] = 53.84, ["Y"] = 53.84,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 52.77, ["X"] = 52.77,
["Y"] = 53.98, ["Y"] = 53.98,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 51.93, ["X"] = 51.93,
["Y"] = 53.19, ["Y"] = 53.19,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 51.84, ["X"] = 51.84,
["Y"] = 52.64, ["Y"] = 52.64,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 52.12, ["X"] = 52.12,
["Y"] = 51.32, ["Y"] = 51.32,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 52.44, ["X"] = 52.44,
["Y"] = 49.9, ["Y"] = 49.9,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 52.48, ["X"] = 52.48,
["Y"] = 48.98, ["Y"] = 48.98,
["CD"] = 0 ["CD"] = 0,
}, },
[50] = [50] = {
{
["X"] = 52.39, ["X"] = 52.39,
["Y"] = 48.33, ["Y"] = 48.33,
["CD"] = 0 ["CD"] = 0,
}, },
[51] = [51] = {
{
["X"] = 52.08, ["X"] = 52.08,
["Y"] = 47.18, ["Y"] = 47.18,
["CD"] = 0 ["CD"] = 0,
}, },
[52] = [52] = {
{
["X"] = 51.87, ["X"] = 51.87,
["Y"] = 46.8, ["Y"] = 46.8,
["CD"] = 0 ["CD"] = 0,
}, },
[53] = [53] = {
{
["X"] = 50.91, ["X"] = 50.91,
["Y"] = 47.03, ["Y"] = 47.03,
["CD"] = 0 ["CD"] = 0,
}, },
[54] = [54] = {
{
["X"] = 50.39, ["X"] = 50.39,
["Y"] = 46.97, ["Y"] = 46.97,
["CD"] = 0 ["CD"] = 0,
}, },
[55] = [55] = {
{
["X"] = 50, ["X"] = 50,
["Y"] = 46.65, ["Y"] = 46.65,
["CD"] = 0 ["CD"] = 0,
}, },
[56] = [56] = {
{
["X"] = 49.86, ["X"] = 49.86,
["Y"] = 46.22, ["Y"] = 46.22,
["CD"] = 0 ["CD"] = 0,
}, },
[57] = [57] = {
{
["X"] = 49.44, ["X"] = 49.44,
["Y"] = 46.49, ["Y"] = 46.49,
["CD"] = 0 ["CD"] = 0,
}, },
[58] = [58] = {
{
["X"] = 48.98, ["X"] = 48.98,
["Y"] = 46.35, ["Y"] = 46.35,
["CD"] = 0 ["CD"] = 0,
}, },
[59] = [59] = {
{
["X"] = 48.4, ["X"] = 48.4,
["Y"] = 45.7, ["Y"] = 45.7,
["CD"] = 0 ["CD"] = 0,
}, },
[60] = [60] = {
{
["X"] = 47.67, ["X"] = 47.67,
["Y"] = 45.04, ["Y"] = 45.04,
["CD"] = 0 ["CD"] = 0,
}, },
[61] = [61] = {
{
["X"] = 47.06, ["X"] = 47.06,
["Y"] = 44.67, ["Y"] = 44.67,
["CD"] = 0 ["CD"] = 0,
}, },
[62] = [62] = {
{
["X"] = 46.5, ["X"] = 46.5,
["Y"] = 43.44, ["Y"] = 43.44,
["CD"] = 0 ["CD"] = 0,
}, },
[63] = [63] = {
{
["X"] = 32.58, ["X"] = 32.58,
["Y"] = 38.7, ["Y"] = 38.7,
["CD"] = 0 ["CD"] = 0,
}, },
[64] = [64] = {
{
["X"] = 34.29, ["X"] = 34.29,
["Y"] = 39.32, ["Y"] = 39.32,
["CD"] = 0 ["CD"] = 0,
}, },
[65] = [65] = {
{
["X"] = 36.08, ["X"] = 36.08,
["Y"] = 39.31, ["Y"] = 39.31,
["CD"] = 0 ["CD"] = 0,
}, },
[66] = [66] = {
{
["X"] = 36.91, ["X"] = 36.91,
["Y"] = 41.58, ["Y"] = 41.58,
["CD"] = 0 ["CD"] = 0,
}, },
[67] = [67] = {
{
["X"] = 38.79, ["X"] = 38.79,
["Y"] = 40.82, ["Y"] = 40.82,
["CD"] = 0 ["CD"] = 0,
}, },
[68] = [68] = {
{
["X"] = 39.68, ["X"] = 39.68,
["Y"] = 40.87, ["Y"] = 40.87,
["CD"] = 0 ["CD"] = 0,
}, },
[69] = [69] = {
{
["X"] = 41.32, ["X"] = 41.32,
["Y"] = 41.66, ["Y"] = 41.66,
["CD"] = 0 ["CD"] = 0,
}, },
[70] = [70] = {
{
["X"] = 42.81, ["X"] = 42.81,
["Y"] = 43.91, ["Y"] = 43.91,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 50 aura_env.wipeDistance = 50
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,305 +1,255 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 43.7, ["X"] = 43.7,
["Y"] = 47.52, ["Y"] = 47.52,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 55.11, ["X"] = 55.11,
["Y"] = 53.52, ["Y"] = 53.52,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 67.75, ["X"] = 67.75,
["Y"] = 35.39, ["Y"] = 35.39,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 46.51, ["X"] = 46.51,
["Y"] = 31.41, ["Y"] = 31.41,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 46.21, ["X"] = 46.21,
["Y"] = 39.28, ["Y"] = 39.28,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 41.5, ["X"] = 41.5,
["Y"] = 42.11, ["Y"] = 42.11,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 50.73, ["X"] = 50.73,
["Y"] = 36.37, ["Y"] = 36.37,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 52, ["X"] = 52,
["Y"] = 38.74, ["Y"] = 38.74,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 51.73, ["X"] = 51.73,
["Y"] = 44.44, ["Y"] = 44.44,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 48.85, ["X"] = 48.85,
["Y"] = 43.36, ["Y"] = 43.36,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 43.36, ["X"] = 43.36,
["Y"] = 27.42, ["Y"] = 27.42,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 38.9, ["X"] = 38.9,
["Y"] = 37.15, ["Y"] = 37.15,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 39.14, ["X"] = 39.14,
["Y"] = 48.19, ["Y"] = 48.19,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 45.77, ["X"] = 45.77,
["Y"] = 43.29, ["Y"] = 43.29,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 42.81, ["X"] = 42.81,
["Y"] = 39.12, ["Y"] = 39.12,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 44.9, ["X"] = 44.9,
["Y"] = 33.39, ["Y"] = 33.39,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 51.19, ["X"] = 51.19,
["Y"] = 34.46, ["Y"] = 34.46,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 54.96, ["X"] = 54.96,
["Y"] = 29.9, ["Y"] = 29.9,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 53.75, ["X"] = 53.75,
["Y"] = 55.53, ["Y"] = 55.53,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 58.01, ["X"] = 58.01,
["Y"] = 52.44, ["Y"] = 52.44,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 73.65, ["X"] = 73.65,
["Y"] = 35.59, ["Y"] = 35.59,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 68.83, ["X"] = 68.83,
["Y"] = 38.1, ["Y"] = 38.1,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 64.86, ["X"] = 64.86,
["Y"] = 31.35, ["Y"] = 31.35,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 55.37, ["X"] = 55.37,
["Y"] = 46.09, ["Y"] = 46.09,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 51.96, ["X"] = 51.96,
["Y"] = 54.69, ["Y"] = 54.69,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 52.07, ["X"] = 52.07,
["Y"] = 48.12, ["Y"] = 48.12,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 39.85, ["X"] = 39.85,
["Y"] = 43.02, ["Y"] = 43.02,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 45.11, ["X"] = 45.11,
["Y"] = 31.92, ["Y"] = 31.92,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 58.81, ["X"] = 58.81,
["Y"] = 42.23, ["Y"] = 42.23,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 56.87, ["X"] = 56.87,
["Y"] = 35.36, ["Y"] = 35.36,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 80.46, ["X"] = 80.46,
["Y"] = 42.58, ["Y"] = 42.58,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 73.35, ["X"] = 73.35,
["Y"] = 40.36, ["Y"] = 40.36,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 65.26, ["X"] = 65.26,
["Y"] = 49, ["Y"] = 49,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 38.29, ["X"] = 38.29,
["Y"] = 21.84, ["Y"] = 21.84,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 64.95, ["X"] = 64.95,
["Y"] = 44.66, ["Y"] = 44.66,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 48.04, ["X"] = 48.04,
["Y"] = 40.24, ["Y"] = 40.24,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 47.18, ["X"] = 47.18,
["Y"] = 41.63, ["Y"] = 41.63,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 30.84, ["X"] = 30.84,
["Y"] = 32.27, ["Y"] = 32.27,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 43.7, ["X"] = 43.7,
["Y"] = 47.52, ["Y"] = 47.52,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 44.9, ["X"] = 44.9,
["Y"] = 33.39, ["Y"] = 33.39,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 49.05, ["X"] = 49.05,
["Y"] = 39.41, ["Y"] = 39.41,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 44.09, ["X"] = 44.09,
["Y"] = 53.11, ["Y"] = 53.11,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 39.14, ["X"] = 39.14,
["Y"] = 32.32, ["Y"] = 32.32,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 61.13, ["X"] = 61.13,
["Y"] = 44.07, ["Y"] = 44.07,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 60.53, ["X"] = 60.53,
["Y"] = 46.91, ["Y"] = 46.91,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 52.47, ["X"] = 52.47,
["Y"] = 52.01, ["Y"] = 52.01,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 68.45, ["X"] = 68.45,
["Y"] = 27.27, ["Y"] = 27.27,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 68.14, ["X"] = 68.14,
["Y"] = 32.64, ["Y"] = 32.64,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 50 aura_env.wipeDistance = 50
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -425,12 +425,11 @@ aura_env.wipeDistance = 50
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0
@@ -450,4 +449,3 @@ aura_env.GetClosestHerb = function()
end end
return aura_env.minID["ID"] return aura_env.minID["ID"]
end end

View File

@@ -270,12 +270,11 @@ aura_env.wipeDistance = 50
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,311 +1,260 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 88.46, ["X"] = 88.46,
["Y"] = 17.99, ["Y"] = 17.99,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 87.27, ["X"] = 87.27,
["Y"] = 17.3, ["Y"] = 17.3,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 86.48, ["X"] = 86.48,
["Y"] = 17.2, ["Y"] = 17.2,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 85.78, ["X"] = 85.78,
["Y"] = 17.6, ["Y"] = 17.6,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 85, ["X"] = 85,
["Y"] = 18.05, ["Y"] = 18.05,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 84.03, ["X"] = 84.03,
["Y"] = 19.24, ["Y"] = 19.24,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 83.28, ["X"] = 83.28,
["Y"] = 20.08, ["Y"] = 20.08,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 82.62, ["X"] = 82.62,
["Y"] = 20.74, ["Y"] = 20.74,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 81.96, ["X"] = 81.96,
["Y"] = 22.01, ["Y"] = 22.01,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 81.22, ["X"] = 81.22,
["Y"] = 22.72, ["Y"] = 22.72,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 80.32, ["X"] = 80.32,
["Y"] = 25.03, ["Y"] = 25.03,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 80.19, ["X"] = 80.19,
["Y"] = 25.92, ["Y"] = 25.92,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 78.88, ["X"] = 78.88,
["Y"] = 27.21, ["Y"] = 27.21,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 77.91, ["X"] = 77.91,
["Y"] = 27.41, ["Y"] = 27.41,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 76.98, ["X"] = 76.98,
["Y"] = 28.38, ["Y"] = 28.38,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 75.11, ["X"] = 75.11,
["Y"] = 32.51, ["Y"] = 32.51,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 74.55, ["X"] = 74.55,
["Y"] = 33.31, ["Y"] = 33.31,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 73.58, ["X"] = 73.58,
["Y"] = 32.76, ["Y"] = 32.76,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 73.64, ["X"] = 73.64,
["Y"] = 31.74, ["Y"] = 31.74,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 73.51, ["X"] = 73.51,
["Y"] = 30.48, ["Y"] = 30.48,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 72.86, ["X"] = 72.86,
["Y"] = 29.99, ["Y"] = 29.99,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 72.18, ["X"] = 72.18,
["Y"] = 28.74, ["Y"] = 28.74,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 72.13, ["X"] = 72.13,
["Y"] = 26.96, ["Y"] = 26.96,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 71.46, ["X"] = 71.46,
["Y"] = 26.17, ["Y"] = 26.17,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 70.67, ["X"] = 70.67,
["Y"] = 26.16, ["Y"] = 26.16,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 90.04, ["X"] = 90.04,
["Y"] = 50.75, ["Y"] = 50.75,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 90.84, ["X"] = 90.84,
["Y"] = 50.84, ["Y"] = 50.84,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 88.81, ["X"] = 88.81,
["Y"] = 61.52, ["Y"] = 61.52,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 78.92, ["X"] = 78.92,
["Y"] = 61.4, ["Y"] = 61.4,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 82.26, ["X"] = 82.26,
["Y"] = 59.77, ["Y"] = 59.77,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 85.43, ["X"] = 85.43,
["Y"] = 57.03, ["Y"] = 57.03,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 74.46, ["X"] = 74.46,
["Y"] = 28.13, ["Y"] = 28.13,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 69.36, ["X"] = 69.36,
["Y"] = 25.49, ["Y"] = 25.49,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 73.21, ["X"] = 73.21,
["Y"] = 26.13, ["Y"] = 26.13,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 56.52, ["X"] = 56.52,
["Y"] = 35.9, ["Y"] = 35.9,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 57.94, ["X"] = 57.94,
["Y"] = 33.32, ["Y"] = 33.32,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 55.19, ["X"] = 55.19,
["Y"] = 32.83, ["Y"] = 32.83,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 54.89, ["X"] = 54.89,
["Y"] = 37.13, ["Y"] = 37.13,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 51.74, ["X"] = 51.74,
["Y"] = 38.92, ["Y"] = 38.92,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 52.5, ["X"] = 52.5,
["Y"] = 38.18, ["Y"] = 38.18,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 49.22, ["X"] = 49.22,
["Y"] = 43.37, ["Y"] = 43.37,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 49.78, ["X"] = 49.78,
["Y"] = 50.78, ["Y"] = 50.78,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 45.13, ["X"] = 45.13,
["Y"] = 52.25, ["Y"] = 52.25,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 45.02, ["X"] = 45.02,
["Y"] = 47.11, ["Y"] = 47.11,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 31.45, ["X"] = 31.45,
["Y"] = 55.09, ["Y"] = 55.09,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 30.49, ["X"] = 30.49,
["Y"] = 60.35, ["Y"] = 60.35,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 26.19, ["X"] = 26.19,
["Y"] = 62.12, ["Y"] = 62.12,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 19.5, ["X"] = 19.5,
["Y"] = 61.05, ["Y"] = 61.05,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 21.36, ["X"] = 21.36,
["Y"] = 56.44, ["Y"] = 56.44,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 15 aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -500,12 +500,11 @@ aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,203 +1,170 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 62.63, ["X"] = 62.63,
["Y"] = 80.15, ["Y"] = 80.15,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 61.03, ["X"] = 61.03,
["Y"] = 83.67, ["Y"] = 83.67,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 60.11, ["X"] = 60.11,
["Y"] = 80.98, ["Y"] = 80.98,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 59.29, ["X"] = 59.29,
["Y"] = 77.46, ["Y"] = 77.46,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 56.55, ["X"] = 56.55,
["Y"] = 77.25, ["Y"] = 77.25,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 56.87, ["X"] = 56.87,
["Y"] = 75.77, ["Y"] = 75.77,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 51.04, ["X"] = 51.04,
["Y"] = 72.92, ["Y"] = 72.92,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 45.02, ["X"] = 45.02,
["Y"] = 70.03, ["Y"] = 70.03,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 72.27, ["X"] = 72.27,
["Y"] = 20.18, ["Y"] = 20.18,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 75.45, ["X"] = 75.45,
["Y"] = 17.55, ["Y"] = 17.55,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 76.63, ["X"] = 76.63,
["Y"] = 19.67, ["Y"] = 19.67,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 75.67, ["X"] = 75.67,
["Y"] = 21.71, ["Y"] = 21.71,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 73.78, ["X"] = 73.78,
["Y"] = 24.85, ["Y"] = 24.85,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 70.92, ["X"] = 70.92,
["Y"] = 34.01, ["Y"] = 34.01,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 65.32, ["X"] = 65.32,
["Y"] = 47.25, ["Y"] = 47.25,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 69.86, ["X"] = 69.86,
["Y"] = 52.11, ["Y"] = 52.11,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 74.82, ["X"] = 74.82,
["Y"] = 57.8, ["Y"] = 57.8,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 73.72, ["X"] = 73.72,
["Y"] = 55.53, ["Y"] = 55.53,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 75.55, ["X"] = 75.55,
["Y"] = 56.07, ["Y"] = 56.07,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 78.32, ["X"] = 78.32,
["Y"] = 59.4, ["Y"] = 59.4,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 77.23, ["X"] = 77.23,
["Y"] = 61.88, ["Y"] = 61.88,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 75.08, ["X"] = 75.08,
["Y"] = 61.89, ["Y"] = 61.89,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 72.99, ["X"] = 72.99,
["Y"] = 62.81, ["Y"] = 62.81,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 71.3, ["X"] = 71.3,
["Y"] = 63.82, ["Y"] = 63.82,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 68.84, ["X"] = 68.84,
["Y"] = 59.76, ["Y"] = 59.76,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 68.09, ["X"] = 68.09,
["Y"] = 59.63, ["Y"] = 59.63,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 67.89, ["X"] = 67.89,
["Y"] = 59.57, ["Y"] = 59.57,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 42.19, ["X"] = 42.19,
["Y"] = 84.08, ["Y"] = 84.08,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 34.22, ["X"] = 34.22,
["Y"] = 48.33, ["Y"] = 48.33,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 34.19, ["X"] = 34.19,
["Y"] = 42.54, ["Y"] = 42.54,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 19.86, ["X"] = 19.86,
["Y"] = 48.49, ["Y"] = 48.49,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 15 aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,497 +1,415 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 14.35, ["X"] = 14.35,
["Y"] = 76.35, ["Y"] = 76.35,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 25.28, ["X"] = 25.28,
["Y"] = 79.69, ["Y"] = 79.69,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 28.67, ["X"] = 28.67,
["Y"] = 77.03, ["Y"] = 77.03,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 31.66, ["X"] = 31.66,
["Y"] = 55.57, ["Y"] = 55.57,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 33.42, ["X"] = 33.42,
["Y"] = 64.79, ["Y"] = 64.79,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 41.99, ["X"] = 41.99,
["Y"] = 64.58, ["Y"] = 64.58,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 48.03, ["X"] = 48.03,
["Y"] = 62.96, ["Y"] = 62.96,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 58.05, ["X"] = 58.05,
["Y"] = 68.72, ["Y"] = 68.72,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 60.82, ["X"] = 60.82,
["Y"] = 59.27, ["Y"] = 59.27,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 69.4, ["X"] = 69.4,
["Y"] = 18.06, ["Y"] = 18.06,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 64.09, ["X"] = 64.09,
["Y"] = 33.24, ["Y"] = 33.24,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 25.89, ["X"] = 25.89,
["Y"] = 52.4, ["Y"] = 52.4,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 12.88, ["X"] = 12.88,
["Y"] = 53.56, ["Y"] = 53.56,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 11.28, ["X"] = 11.28,
["Y"] = 76.14, ["Y"] = 76.14,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 16.6, ["X"] = 16.6,
["Y"] = 76.51, ["Y"] = 76.51,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 33.37, ["X"] = 33.37,
["Y"] = 67.96, ["Y"] = 67.96,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 36.36, ["X"] = 36.36,
["Y"] = 76.93, ["Y"] = 76.93,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 30.05, ["X"] = 30.05,
["Y"] = 26.97, ["Y"] = 26.97,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 31.46, ["X"] = 31.46,
["Y"] = 25.61, ["Y"] = 25.61,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 29.86, ["X"] = 29.86,
["Y"] = 26.25, ["Y"] = 26.25,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 32.14, ["X"] = 32.14,
["Y"] = 25.25, ["Y"] = 25.25,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 30.97, ["X"] = 30.97,
["Y"] = 60.08, ["Y"] = 60.08,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 32.46, ["X"] = 32.46,
["Y"] = 62.51, ["Y"] = 62.51,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 71.46, ["X"] = 71.46,
["Y"] = 26.17, ["Y"] = 26.17,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 70.67, ["X"] = 70.67,
["Y"] = 26.16, ["Y"] = 26.16,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 90.04, ["X"] = 90.04,
["Y"] = 50.75, ["Y"] = 50.75,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 90.84, ["X"] = 90.84,
["Y"] = 50.84, ["Y"] = 50.84,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 88.81, ["X"] = 88.81,
["Y"] = 61.52, ["Y"] = 61.52,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 78.92, ["X"] = 78.92,
["Y"] = 61.4, ["Y"] = 61.4,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 82.26, ["X"] = 82.26,
["Y"] = 59.77, ["Y"] = 59.77,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 85.43, ["X"] = 85.43,
["Y"] = 57.03, ["Y"] = 57.03,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 74.46, ["X"] = 74.46,
["Y"] = 28.13, ["Y"] = 28.13,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 69.36, ["X"] = 69.36,
["Y"] = 25.49, ["Y"] = 25.49,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 73.21, ["X"] = 73.21,
["Y"] = 26.13, ["Y"] = 26.13,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 56.52, ["X"] = 56.52,
["Y"] = 35.9, ["Y"] = 35.9,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 57.94, ["X"] = 57.94,
["Y"] = 33.32, ["Y"] = 33.32,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 55.19, ["X"] = 55.19,
["Y"] = 32.83, ["Y"] = 32.83,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 54.89, ["X"] = 54.89,
["Y"] = 37.13, ["Y"] = 37.13,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 51.74, ["X"] = 51.74,
["Y"] = 38.92, ["Y"] = 38.92,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 52.5, ["X"] = 52.5,
["Y"] = 38.18, ["Y"] = 38.18,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 49.22, ["X"] = 49.22,
["Y"] = 43.37, ["Y"] = 43.37,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 49.78, ["X"] = 49.78,
["Y"] = 50.78, ["Y"] = 50.78,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 45.13, ["X"] = 45.13,
["Y"] = 52.25, ["Y"] = 52.25,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 45.02, ["X"] = 45.02,
["Y"] = 47.11, ["Y"] = 47.11,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 31.45, ["X"] = 31.45,
["Y"] = 55.09, ["Y"] = 55.09,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 30.49, ["X"] = 30.49,
["Y"] = 60.35, ["Y"] = 60.35,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 26.19, ["X"] = 26.19,
["Y"] = 62.12, ["Y"] = 62.12,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 19.5, ["X"] = 19.5,
["Y"] = 61.05, ["Y"] = 61.05,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 21.36, ["X"] = 21.36,
["Y"] = 56.44, ["Y"] = 56.44,
["CD"] = 0 ["CD"] = 0,
}, },
[50] = [50] = {
{
["X"] = 62.63, ["X"] = 62.63,
["Y"] = 80.15, ["Y"] = 80.15,
["CD"] = 0 ["CD"] = 0,
}, },
[51] = [51] = {
{
["X"] = 61.03, ["X"] = 61.03,
["Y"] = 83.67, ["Y"] = 83.67,
["CD"] = 0 ["CD"] = 0,
}, },
[52] = [52] = {
{
["X"] = 60.11, ["X"] = 60.11,
["Y"] = 80.98, ["Y"] = 80.98,
["CD"] = 0 ["CD"] = 0,
}, },
[53] = [53] = {
{
["X"] = 59.29, ["X"] = 59.29,
["Y"] = 77.46, ["Y"] = 77.46,
["CD"] = 0 ["CD"] = 0,
}, },
[54] = [54] = {
{
["X"] = 56.55, ["X"] = 56.55,
["Y"] = 77.25, ["Y"] = 77.25,
["CD"] = 0 ["CD"] = 0,
}, },
[55] = [55] = {
{
["X"] = 56.87, ["X"] = 56.87,
["Y"] = 75.77, ["Y"] = 75.77,
["CD"] = 0 ["CD"] = 0,
}, },
[56] = [56] = {
{
["X"] = 51.04, ["X"] = 51.04,
["Y"] = 72.92, ["Y"] = 72.92,
["CD"] = 0 ["CD"] = 0,
}, },
[57] = [57] = {
{
["X"] = 45.02, ["X"] = 45.02,
["Y"] = 70.03, ["Y"] = 70.03,
["CD"] = 0 ["CD"] = 0,
}, },
[58] = [58] = {
{
["X"] = 72.27, ["X"] = 72.27,
["Y"] = 20.18, ["Y"] = 20.18,
["CD"] = 0 ["CD"] = 0,
}, },
[59] = [59] = {
{
["X"] = 75.45, ["X"] = 75.45,
["Y"] = 17.55, ["Y"] = 17.55,
["CD"] = 0 ["CD"] = 0,
}, },
[60] = [60] = {
{
["X"] = 76.63, ["X"] = 76.63,
["Y"] = 19.67, ["Y"] = 19.67,
["CD"] = 0 ["CD"] = 0,
}, },
[61] = [61] = {
{
["X"] = 75.67, ["X"] = 75.67,
["Y"] = 21.71, ["Y"] = 21.71,
["CD"] = 0 ["CD"] = 0,
}, },
[62] = [62] = {
{
["X"] = 73.78, ["X"] = 73.78,
["Y"] = 24.85, ["Y"] = 24.85,
["CD"] = 0 ["CD"] = 0,
}, },
[63] = [63] = {
{
["X"] = 70.92, ["X"] = 70.92,
["Y"] = 34.01, ["Y"] = 34.01,
["CD"] = 0 ["CD"] = 0,
}, },
[64] = [64] = {
{
["X"] = 65.32, ["X"] = 65.32,
["Y"] = 47.25, ["Y"] = 47.25,
["CD"] = 0 ["CD"] = 0,
}, },
[65] = [65] = {
{
["X"] = 69.86, ["X"] = 69.86,
["Y"] = 52.11, ["Y"] = 52.11,
["CD"] = 0 ["CD"] = 0,
}, },
[66] = [66] = {
{
["X"] = 74.82, ["X"] = 74.82,
["Y"] = 57.8, ["Y"] = 57.8,
["CD"] = 0 ["CD"] = 0,
}, },
[67] = [67] = {
{
["X"] = 73.72, ["X"] = 73.72,
["Y"] = 55.53, ["Y"] = 55.53,
["CD"] = 0 ["CD"] = 0,
}, },
[68] = [68] = {
{
["X"] = 75.55, ["X"] = 75.55,
["Y"] = 56.07, ["Y"] = 56.07,
["CD"] = 0 ["CD"] = 0,
}, },
[69] = [69] = {
{
["X"] = 78.32, ["X"] = 78.32,
["Y"] = 59.4, ["Y"] = 59.4,
["CD"] = 0 ["CD"] = 0,
}, },
[70] = [70] = {
{
["X"] = 77.23, ["X"] = 77.23,
["Y"] = 61.88, ["Y"] = 61.88,
["CD"] = 0 ["CD"] = 0,
}, },
[71] = [71] = {
{
["X"] = 75.08, ["X"] = 75.08,
["Y"] = 61.89, ["Y"] = 61.89,
["CD"] = 0 ["CD"] = 0,
}, },
[72] = [72] = {
{
["X"] = 72.99, ["X"] = 72.99,
["Y"] = 62.81, ["Y"] = 62.81,
["CD"] = 0 ["CD"] = 0,
}, },
[73] = [73] = {
{
["X"] = 71.3, ["X"] = 71.3,
["Y"] = 63.82, ["Y"] = 63.82,
["CD"] = 0 ["CD"] = 0,
}, },
[74] = [74] = {
{
["X"] = 68.84, ["X"] = 68.84,
["Y"] = 59.76, ["Y"] = 59.76,
["CD"] = 0 ["CD"] = 0,
}, },
[75] = [75] = {
{
["X"] = 68.09, ["X"] = 68.09,
["Y"] = 59.63, ["Y"] = 59.63,
["CD"] = 0 ["CD"] = 0,
}, },
[76] = [76] = {
{
["X"] = 67.89, ["X"] = 67.89,
["Y"] = 59.57, ["Y"] = 59.57,
["CD"] = 0 ["CD"] = 0,
}, },
[77] = [77] = {
{
["X"] = 42.19, ["X"] = 42.19,
["Y"] = 84.08, ["Y"] = 84.08,
["CD"] = 0 ["CD"] = 0,
}, },
[78] = [78] = {
{
["X"] = 34.22, ["X"] = 34.22,
["Y"] = 48.33, ["Y"] = 48.33,
["CD"] = 0 ["CD"] = 0,
}, },
[79] = [79] = {
{
["X"] = 34.19, ["X"] = 34.19,
["Y"] = 42.54, ["Y"] = 42.54,
["CD"] = 0 ["CD"] = 0,
}, },
[80] = [80] = {
{
["X"] = 19.86, ["X"] = 19.86,
["Y"] = 48.49, ["Y"] = 48.49,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 15 aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,539 +1,450 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 50.79, ["X"] = 50.79,
["Y"] = 52.35, ["Y"] = 52.35,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 52.7, ["X"] = 52.7,
["Y"] = 53.22, ["Y"] = 53.22,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 53.94, ["X"] = 53.94,
["Y"] = 53.78, ["Y"] = 53.78,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 53.24, ["X"] = 53.24,
["Y"] = 55.02, ["Y"] = 55.02,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 52.65, ["X"] = 52.65,
["Y"] = 55.24, ["Y"] = 55.24,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 51.67, ["X"] = 51.67,
["Y"] = 54.04, ["Y"] = 54.04,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 51.15, ["X"] = 51.15,
["Y"] = 52.08, ["Y"] = 52.08,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 49.47, ["X"] = 49.47,
["Y"] = 53.86, ["Y"] = 53.86,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 44.63, ["X"] = 44.63,
["Y"] = 60.71, ["Y"] = 60.71,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 44.89, ["X"] = 44.89,
["Y"] = 67.28, ["Y"] = 67.28,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 44.44, ["X"] = 44.44,
["Y"] = 67.36, ["Y"] = 67.36,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 44.34, ["X"] = 44.34,
["Y"] = 68.45, ["Y"] = 68.45,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 44.14, ["X"] = 44.14,
["Y"] = 69.89, ["Y"] = 69.89,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 44.17, ["X"] = 44.17,
["Y"] = 71.32, ["Y"] = 71.32,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 47.78, ["X"] = 47.78,
["Y"] = 68.45, ["Y"] = 68.45,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 46.65, ["X"] = 46.65,
["Y"] = 68.58, ["Y"] = 68.58,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 48.76, ["X"] = 48.76,
["Y"] = 73.26, ["Y"] = 73.26,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 48.01, ["X"] = 48.01,
["Y"] = 72.75, ["Y"] = 72.75,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 49.41, ["X"] = 49.41,
["Y"] = 72.56, ["Y"] = 72.56,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 48.95, ["X"] = 48.95,
["Y"] = 70.6, ["Y"] = 70.6,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 47.55, ["X"] = 47.55,
["Y"] = 70.14, ["Y"] = 70.14,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 44.82, ["X"] = 44.82,
["Y"] = 75.25, ["Y"] = 75.25,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 45.77, ["X"] = 45.77,
["Y"] = 77.89, ["Y"] = 77.89,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 44.83, ["X"] = 44.83,
["Y"] = 76, ["Y"] = 76,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 43.85, ["X"] = 43.85,
["Y"] = 75.69, ["Y"] = 75.69,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 43.04, ["X"] = 43.04,
["Y"] = 75.56, ["Y"] = 75.56,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 44.83, ["X"] = 44.83,
["Y"] = 75.18, ["Y"] = 75.18,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 43.97, ["X"] = 43.97,
["Y"] = 74.02, ["Y"] = 74.02,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 43.68, ["X"] = 43.68,
["Y"] = 73.14, ["Y"] = 73.14,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 43.75, ["X"] = 43.75,
["Y"] = 54.52, ["Y"] = 54.52,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 45.46, ["X"] = 45.46,
["Y"] = 53.73, ["Y"] = 53.73,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 45.89, ["X"] = 45.89,
["Y"] = 42.83, ["Y"] = 42.83,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 45.45, ["X"] = 45.45,
["Y"] = 42.34, ["Y"] = 42.34,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 45.1, ["X"] = 45.1,
["Y"] = 42.78, ["Y"] = 42.78,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 45.03, ["X"] = 45.03,
["Y"] = 43.2, ["Y"] = 43.2,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 45.68, ["X"] = 45.68,
["Y"] = 43.92, ["Y"] = 43.92,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 47.01, ["X"] = 47.01,
["Y"] = 44.4, ["Y"] = 44.4,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 47.62, ["X"] = 47.62,
["Y"] = 45.31, ["Y"] = 45.31,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 44.35, ["X"] = 44.35,
["Y"] = 50.32, ["Y"] = 50.32,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 43.54, ["X"] = 43.54,
["Y"] = 47.68, ["Y"] = 47.68,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 43.35, ["X"] = 43.35,
["Y"] = 47.13, ["Y"] = 47.13,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 40.68, ["X"] = 40.68,
["Y"] = 34.69, ["Y"] = 34.69,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 41.47, ["X"] = 41.47,
["Y"] = 36.3, ["Y"] = 36.3,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 42.18, ["X"] = 42.18,
["Y"] = 36.37, ["Y"] = 36.37,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 42.68, ["X"] = 42.68,
["Y"] = 35.45, ["Y"] = 35.45,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 42.41, ["X"] = 42.41,
["Y"] = 34.31, ["Y"] = 34.31,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 43.14, ["X"] = 43.14,
["Y"] = 34.43, ["Y"] = 34.43,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 42.81, ["X"] = 42.81,
["Y"] = 32.83, ["Y"] = 32.83,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 43.7, ["X"] = 43.7,
["Y"] = 33.32, ["Y"] = 33.32,
["CD"] = 0 ["CD"] = 0,
}, },
[50] = [50] = {
{
["X"] = 44.13, ["X"] = 44.13,
["Y"] = 30.6, ["Y"] = 30.6,
["CD"] = 0 ["CD"] = 0,
}, },
[51] = [51] = {
{
["X"] = 44.71, ["X"] = 44.71,
["Y"] = 29.48, ["Y"] = 29.48,
["CD"] = 0 ["CD"] = 0,
}, },
[52] = [52] = {
{
["X"] = 43.81, ["X"] = 43.81,
["Y"] = 27.15, ["Y"] = 27.15,
["CD"] = 0 ["CD"] = 0,
}, },
[53] = [53] = {
{
["X"] = 43.3, ["X"] = 43.3,
["Y"] = 25.86, ["Y"] = 25.86,
["CD"] = 0 ["CD"] = 0,
}, },
[54] = [54] = {
{
["X"] = 41.18, ["X"] = 41.18,
["Y"] = 25.89, ["Y"] = 25.89,
["CD"] = 0 ["CD"] = 0,
}, },
[55] = [55] = {
{
["X"] = 41.63, ["X"] = 41.63,
["Y"] = 24.99, ["Y"] = 24.99,
["CD"] = 0 ["CD"] = 0,
}, },
[56] = [56] = {
{
["X"] = 43.99, ["X"] = 43.99,
["Y"] = 24.13, ["Y"] = 24.13,
["CD"] = 0 ["CD"] = 0,
}, },
[57] = [57] = {
{
["X"] = 45, ["X"] = 45,
["Y"] = 24.59, ["Y"] = 24.59,
["CD"] = 0 ["CD"] = 0,
}, },
[58] = [58] = {
{
["X"] = 51.32, ["X"] = 51.32,
["Y"] = 25.48, ["Y"] = 25.48,
["CD"] = 0 ["CD"] = 0,
}, },
[59] = [59] = {
{
["X"] = 50.95, ["X"] = 50.95,
["Y"] = 26.35, ["Y"] = 26.35,
["CD"] = 0 ["CD"] = 0,
}, },
[60] = [60] = {
{
["X"] = 49.69, ["X"] = 49.69,
["Y"] = 27.85, ["Y"] = 27.85,
["CD"] = 0 ["CD"] = 0,
}, },
[61] = [61] = {
{
["X"] = 49.88, ["X"] = 49.88,
["Y"] = 28.33, ["Y"] = 28.33,
["CD"] = 0 ["CD"] = 0,
}, },
[62] = [62] = {
{
["X"] = 49.1, ["X"] = 49.1,
["Y"] = 29.38, ["Y"] = 29.38,
["CD"] = 0 ["CD"] = 0,
}, },
[63] = [63] = {
{
["X"] = 47.93, ["X"] = 47.93,
["Y"] = 29.24, ["Y"] = 29.24,
["CD"] = 0 ["CD"] = 0,
}, },
[64] = [64] = {
{
["X"] = 47.05, ["X"] = 47.05,
["Y"] = 30.01, ["Y"] = 30.01,
["CD"] = 0 ["CD"] = 0,
}, },
[65] = [65] = {
{
["X"] = 46.76, ["X"] = 46.76,
["Y"] = 32.28, ["Y"] = 32.28,
["CD"] = 0 ["CD"] = 0,
}, },
[66] = [66] = {
{
["X"] = 51.53, ["X"] = 51.53,
["Y"] = 37.03, ["Y"] = 37.03,
["CD"] = 0 ["CD"] = 0,
}, },
[67] = [67] = {
{
["X"] = 52.24, ["X"] = 52.24,
["Y"] = 39.43, ["Y"] = 39.43,
["CD"] = 0 ["CD"] = 0,
}, },
[68] = [68] = {
{
["X"] = 51.9, ["X"] = 51.9,
["Y"] = 38.07, ["Y"] = 38.07,
["CD"] = 0 ["CD"] = 0,
}, },
[69] = [69] = {
{
["X"] = 50.52, ["X"] = 50.52,
["Y"] = 38.82, ["Y"] = 38.82,
["CD"] = 0 ["CD"] = 0,
}, },
[70] = [70] = {
{
["X"] = 49.72, ["X"] = 49.72,
["Y"] = 39.5, ["Y"] = 39.5,
["CD"] = 0 ["CD"] = 0,
}, },
[71] = [71] = {
{
["X"] = 47.85, ["X"] = 47.85,
["Y"] = 68.43, ["Y"] = 68.43,
["CD"] = 0 ["CD"] = 0,
}, },
[72] = [72] = {
{
["X"] = 32.68, ["X"] = 32.68,
["Y"] = 51.4, ["Y"] = 51.4,
["CD"] = 0 ["CD"] = 0,
}, },
[73] = [73] = {
{
["X"] = 33.07, ["X"] = 33.07,
["Y"] = 48.65, ["Y"] = 48.65,
["CD"] = 0 ["CD"] = 0,
}, },
[74] = [74] = {
{
["X"] = 34.22, ["X"] = 34.22,
["Y"] = 47.52, ["Y"] = 47.52,
["CD"] = 0 ["CD"] = 0,
}, },
[75] = [75] = {
{
["X"] = 35.38, ["X"] = 35.38,
["Y"] = 49.24, ["Y"] = 49.24,
["CD"] = 0 ["CD"] = 0,
}, },
[76] = [76] = {
{
["X"] = 36.3, ["X"] = 36.3,
["Y"] = 49.81, ["Y"] = 49.81,
["CD"] = 0 ["CD"] = 0,
}, },
[77] = [77] = {
{
["X"] = 37.23, ["X"] = 37.23,
["Y"] = 53.49, ["Y"] = 53.49,
["CD"] = 0 ["CD"] = 0,
}, },
[78] = [78] = {
{
["X"] = 37.55, ["X"] = 37.55,
["Y"] = 54.77, ["Y"] = 54.77,
["CD"] = 0 ["CD"] = 0,
}, },
[79] = [79] = {
{
["X"] = 37.48, ["X"] = 37.48,
["Y"] = 55.75, ["Y"] = 55.75,
["CD"] = 0 ["CD"] = 0,
}, },
[80] = [80] = {
{
["X"] = 39.14, ["X"] = 39.14,
["Y"] = 59.76, ["Y"] = 59.76,
["CD"] = 0 ["CD"] = 0,
}, },
[81] = [81] = {
{
["X"] = 39.01, ["X"] = 39.01,
["Y"] = 58.93, ["Y"] = 58.93,
["CD"] = 0 ["CD"] = 0,
}, },
[82] = [82] = {
{
["X"] = 38.69, ["X"] = 38.69,
["Y"] = 58.31, ["Y"] = 58.31,
["CD"] = 0 ["CD"] = 0,
}, },
[83] = [83] = {
{
["X"] = 38.55, ["X"] = 38.55,
["Y"] = 57.23, ["Y"] = 57.23,
["CD"] = 0 ["CD"] = 0,
}, },
[84] = [84] = {
{
["X"] = 36.59, ["X"] = 36.59,
["Y"] = 56.72, ["Y"] = 56.72,
["CD"] = 0 ["CD"] = 0,
}, },
[85] = [85] = {
{
["X"] = 34.3, ["X"] = 34.3,
["Y"] = 55.25, ["Y"] = 55.25,
["CD"] = 0 ["CD"] = 0,
}, },
[86] = [86] = {
{
["X"] = 26.1, ["X"] = 26.1,
["Y"] = 14.77, ["Y"] = 14.77,
["CD"] = 0 ["CD"] = 0,
}, },
[87] = [87] = {
{
["X"] = 45.95, ["X"] = 45.95,
["Y"] = 29.55, ["Y"] = 29.55,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 20 aura_env.wipeDistance = 20
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,539 +1,450 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 67.25, ["X"] = 67.25,
["Y"] = 73.74, ["Y"] = 73.74,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 68.53, ["X"] = 68.53,
["Y"] = 73.25, ["Y"] = 73.25,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 69.34, ["X"] = 69.34,
["Y"] = 73.84, ["Y"] = 73.84,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 62.86, ["X"] = 62.86,
["Y"] = 51.94, ["Y"] = 51.94,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 63.66, ["X"] = 63.66,
["Y"] = 50.43, ["Y"] = 50.43,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 65.41, ["X"] = 65.41,
["Y"] = 50.69, ["Y"] = 50.69,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 64.95, ["X"] = 64.95,
["Y"] = 51.87, ["Y"] = 51.87,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 64.6, ["X"] = 64.6,
["Y"] = 54.88, ["Y"] = 54.88,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 52.44, ["X"] = 52.44,
["Y"] = 43.72, ["Y"] = 43.72,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 51.89, ["X"] = 51.89,
["Y"] = 42.38, ["Y"] = 42.38,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 50.37, ["X"] = 50.37,
["Y"] = 42.54, ["Y"] = 42.54,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 49.81, ["X"] = 49.81,
["Y"] = 41.96, ["Y"] = 41.96,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 49.12, ["X"] = 49.12,
["Y"] = 40.6, ["Y"] = 40.6,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 48.34, ["X"] = 48.34,
["Y"] = 39.21, ["Y"] = 39.21,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 48.02, ["X"] = 48.02,
["Y"] = 36.6, ["Y"] = 36.6,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 46.86, ["X"] = 46.86,
["Y"] = 36.72, ["Y"] = 36.72,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 46.75, ["X"] = 46.75,
["Y"] = 34.53, ["Y"] = 34.53,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 25.94, ["X"] = 25.94,
["Y"] = 28.99, ["Y"] = 28.99,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 29.48, ["X"] = 29.48,
["Y"] = 25.3, ["Y"] = 25.3,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 28.4, ["X"] = 28.4,
["Y"] = 25.56, ["Y"] = 25.56,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 28.51, ["X"] = 28.51,
["Y"] = 23.82, ["Y"] = 23.82,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 29.61, ["X"] = 29.61,
["Y"] = 22.79, ["Y"] = 22.79,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 29.75, ["X"] = 29.75,
["Y"] = 21.84, ["Y"] = 21.84,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 26.43, ["X"] = 26.43,
["Y"] = 10.9, ["Y"] = 10.9,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 25.97, ["X"] = 25.97,
["Y"] = 12.48, ["Y"] = 12.48,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 25.9, ["X"] = 25.9,
["Y"] = 15.81, ["Y"] = 15.81,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 25.73, ["X"] = 25.73,
["Y"] = 16.64, ["Y"] = 16.64,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 25.45, ["X"] = 25.45,
["Y"] = 17.29, ["Y"] = 17.29,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 25.4, ["X"] = 25.4,
["Y"] = 18.4, ["Y"] = 18.4,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 25.26, ["X"] = 25.26,
["Y"] = 19.79, ["Y"] = 19.79,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 26.03, ["X"] = 26.03,
["Y"] = 24.44, ["Y"] = 24.44,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 26.04, ["X"] = 26.04,
["Y"] = 23.22, ["Y"] = 23.22,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 24.19, ["X"] = 24.19,
["Y"] = 23.27, ["Y"] = 23.27,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 24.28, ["X"] = 24.28,
["Y"] = 24.89, ["Y"] = 24.89,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 24.47, ["X"] = 24.47,
["Y"] = 25.24, ["Y"] = 25.24,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 24.46, ["X"] = 24.46,
["Y"] = 26.17, ["Y"] = 26.17,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 24.98, ["X"] = 24.98,
["Y"] = 27.02, ["Y"] = 27.02,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 24.82, ["X"] = 24.82,
["Y"] = 27.95, ["Y"] = 27.95,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 24.87, ["X"] = 24.87,
["Y"] = 29.34, ["Y"] = 29.34,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 24.49, ["X"] = 24.49,
["Y"] = 30.19, ["Y"] = 30.19,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 23.53, ["X"] = 23.53,
["Y"] = 30.88, ["Y"] = 30.88,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 23.17, ["X"] = 23.17,
["Y"] = 31.72, ["Y"] = 31.72,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 22.88, ["X"] = 22.88,
["Y"] = 32.62, ["Y"] = 32.62,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 21.65, ["X"] = 21.65,
["Y"] = 33.2, ["Y"] = 33.2,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 19.95, ["X"] = 19.95,
["Y"] = 33.28, ["Y"] = 33.28,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 21.16, ["X"] = 21.16,
["Y"] = 34.77, ["Y"] = 34.77,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 22.35, ["X"] = 22.35,
["Y"] = 34.03, ["Y"] = 34.03,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 31.87, ["X"] = 31.87,
["Y"] = 52.38, ["Y"] = 52.38,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 30.31, ["X"] = 30.31,
["Y"] = 53, ["Y"] = 53,
["CD"] = 0 ["CD"] = 0,
}, },
[50] = [50] = {
{
["X"] = 28.27, ["X"] = 28.27,
["Y"] = 53.65, ["Y"] = 53.65,
["CD"] = 0 ["CD"] = 0,
}, },
[51] = [51] = {
{
["X"] = 27.54, ["X"] = 27.54,
["Y"] = 53.51, ["Y"] = 53.51,
["CD"] = 0 ["CD"] = 0,
}, },
[52] = [52] = {
{
["X"] = 27.6, ["X"] = 27.6,
["Y"] = 52.81, ["Y"] = 52.81,
["CD"] = 0 ["CD"] = 0,
}, },
[53] = [53] = {
{
["X"] = 26.91, ["X"] = 26.91,
["Y"] = 53.27, ["Y"] = 53.27,
["CD"] = 0 ["CD"] = 0,
}, },
[54] = [54] = {
{
["X"] = 25.45, ["X"] = 25.45,
["Y"] = 54.29, ["Y"] = 54.29,
["CD"] = 0 ["CD"] = 0,
}, },
[55] = [55] = {
{
["X"] = 25.36, ["X"] = 25.36,
["Y"] = 53.45, ["Y"] = 53.45,
["CD"] = 0 ["CD"] = 0,
}, },
[56] = [56] = {
{
["X"] = 22.29, ["X"] = 22.29,
["Y"] = 54.37, ["Y"] = 54.37,
["CD"] = 0 ["CD"] = 0,
}, },
[57] = [57] = {
{
["X"] = 23.11, ["X"] = 23.11,
["Y"] = 55.13, ["Y"] = 55.13,
["CD"] = 0 ["CD"] = 0,
}, },
[58] = [58] = {
{
["X"] = 24.34, ["X"] = 24.34,
["Y"] = 55.09, ["Y"] = 55.09,
["CD"] = 0 ["CD"] = 0,
}, },
[59] = [59] = {
{
["X"] = 24.03, ["X"] = 24.03,
["Y"] = 55.88, ["Y"] = 55.88,
["CD"] = 0 ["CD"] = 0,
}, },
[60] = [60] = {
{
["X"] = 24.95, ["X"] = 24.95,
["Y"] = 59.85, ["Y"] = 59.85,
["CD"] = 0 ["CD"] = 0,
}, },
[61] = [61] = {
{
["X"] = 24.84, ["X"] = 24.84,
["Y"] = 61.41, ["Y"] = 61.41,
["CD"] = 0 ["CD"] = 0,
}, },
[62] = [62] = {
{
["X"] = 34.59, ["X"] = 34.59,
["Y"] = 69.79, ["Y"] = 69.79,
["CD"] = 0 ["CD"] = 0,
}, },
[63] = [63] = {
{
["X"] = 33.59, ["X"] = 33.59,
["Y"] = 68.41, ["Y"] = 68.41,
["CD"] = 0 ["CD"] = 0,
}, },
[64] = [64] = {
{
["X"] = 31.96, ["X"] = 31.96,
["Y"] = 69.06, ["Y"] = 69.06,
["CD"] = 0 ["CD"] = 0,
}, },
[65] = [65] = {
{
["X"] = 29.87, ["X"] = 29.87,
["Y"] = 65.93, ["Y"] = 65.93,
["CD"] = 0 ["CD"] = 0,
}, },
[66] = [66] = {
{
["X"] = 30.95, ["X"] = 30.95,
["Y"] = 64.82, ["Y"] = 64.82,
["CD"] = 0 ["CD"] = 0,
}, },
[67] = [67] = {
{
["X"] = 32.43, ["X"] = 32.43,
["Y"] = 62.85, ["Y"] = 62.85,
["CD"] = 0 ["CD"] = 0,
}, },
[68] = [68] = {
{
["X"] = 32.7, ["X"] = 32.7,
["Y"] = 61.83, ["Y"] = 61.83,
["CD"] = 0 ["CD"] = 0,
}, },
[69] = [69] = {
{
["X"] = 33.05, ["X"] = 33.05,
["Y"] = 57.88, ["Y"] = 57.88,
["CD"] = 0 ["CD"] = 0,
}, },
[70] = [70] = {
{
["X"] = 32.43, ["X"] = 32.43,
["Y"] = 56.41, ["Y"] = 56.41,
["CD"] = 0 ["CD"] = 0,
}, },
[71] = [71] = {
{
["X"] = 33.85, ["X"] = 33.85,
["Y"] = 54.08, ["Y"] = 54.08,
["CD"] = 0 ["CD"] = 0,
}, },
[72] = [72] = {
{
["X"] = 32.68, ["X"] = 32.68,
["Y"] = 51.4, ["Y"] = 51.4,
["CD"] = 0 ["CD"] = 0,
}, },
[73] = [73] = {
{
["X"] = 33.07, ["X"] = 33.07,
["Y"] = 48.65, ["Y"] = 48.65,
["CD"] = 0 ["CD"] = 0,
}, },
[74] = [74] = {
{
["X"] = 34.22, ["X"] = 34.22,
["Y"] = 47.52, ["Y"] = 47.52,
["CD"] = 0 ["CD"] = 0,
}, },
[75] = [75] = {
{
["X"] = 35.38, ["X"] = 35.38,
["Y"] = 49.24, ["Y"] = 49.24,
["CD"] = 0 ["CD"] = 0,
}, },
[76] = [76] = {
{
["X"] = 36.3, ["X"] = 36.3,
["Y"] = 49.81, ["Y"] = 49.81,
["CD"] = 0 ["CD"] = 0,
}, },
[77] = [77] = {
{
["X"] = 37.23, ["X"] = 37.23,
["Y"] = 53.49, ["Y"] = 53.49,
["CD"] = 0 ["CD"] = 0,
}, },
[78] = [78] = {
{
["X"] = 37.55, ["X"] = 37.55,
["Y"] = 54.77, ["Y"] = 54.77,
["CD"] = 0 ["CD"] = 0,
}, },
[79] = [79] = {
{
["X"] = 37.48, ["X"] = 37.48,
["Y"] = 55.75, ["Y"] = 55.75,
["CD"] = 0 ["CD"] = 0,
}, },
[80] = [80] = {
{
["X"] = 39.14, ["X"] = 39.14,
["Y"] = 59.76, ["Y"] = 59.76,
["CD"] = 0 ["CD"] = 0,
}, },
[81] = [81] = {
{
["X"] = 39.01, ["X"] = 39.01,
["Y"] = 58.93, ["Y"] = 58.93,
["CD"] = 0 ["CD"] = 0,
}, },
[82] = [82] = {
{
["X"] = 38.69, ["X"] = 38.69,
["Y"] = 58.31, ["Y"] = 58.31,
["CD"] = 0 ["CD"] = 0,
}, },
[83] = [83] = {
{
["X"] = 38.55, ["X"] = 38.55,
["Y"] = 57.23, ["Y"] = 57.23,
["CD"] = 0 ["CD"] = 0,
}, },
[84] = [84] = {
{
["X"] = 36.59, ["X"] = 36.59,
["Y"] = 56.72, ["Y"] = 56.72,
["CD"] = 0 ["CD"] = 0,
}, },
[85] = [85] = {
{
["X"] = 34.3, ["X"] = 34.3,
["Y"] = 55.25, ["Y"] = 55.25,
["CD"] = 0 ["CD"] = 0,
}, },
[86] = [86] = {
{
["X"] = 26.1, ["X"] = 26.1,
["Y"] = 14.77, ["Y"] = 14.77,
["CD"] = 0 ["CD"] = 0,
}, },
[87] = [87] = {
{
["X"] = 45.95, ["X"] = 45.95,
["Y"] = 29.55, ["Y"] = 29.55,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 20 aura_env.wipeDistance = 20
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,497 +1,415 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 29.47, ["X"] = 29.47,
["Y"] = 31.25, ["Y"] = 31.25,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 28.15, ["X"] = 28.15,
["Y"] = 37.03, ["Y"] = 37.03,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 26.89, ["X"] = 26.89,
["Y"] = 35.94, ["Y"] = 35.94,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 26.1, ["X"] = 26.1,
["Y"] = 38.55, ["Y"] = 38.55,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 24.92, ["X"] = 24.92,
["Y"] = 42.79, ["Y"] = 42.79,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 24.22, ["X"] = 24.22,
["Y"] = 45.41, ["Y"] = 45.41,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 23.88, ["X"] = 23.88,
["Y"] = 48.95, ["Y"] = 48.95,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 25.79, ["X"] = 25.79,
["Y"] = 49.81, ["Y"] = 49.81,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 26.82, ["X"] = 26.82,
["Y"] = 46.94, ["Y"] = 46.94,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 31.6, ["X"] = 31.6,
["Y"] = 49.24, ["Y"] = 49.24,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 33.02, ["X"] = 33.02,
["Y"] = 46.44, ["Y"] = 46.44,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 28.44, ["X"] = 28.44,
["Y"] = 43.1, ["Y"] = 43.1,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 23.55, ["X"] = 23.55,
["Y"] = 48.35, ["Y"] = 48.35,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 20.43, ["X"] = 20.43,
["Y"] = 52.82, ["Y"] = 52.82,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 25.81, ["X"] = 25.81,
["Y"] = 52.62, ["Y"] = 52.62,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 26.13, ["X"] = 26.13,
["Y"] = 55.42, ["Y"] = 55.42,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 26.22, ["X"] = 26.22,
["Y"] = 53.16, ["Y"] = 53.16,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 24.67, ["X"] = 24.67,
["Y"] = 51.58, ["Y"] = 51.58,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 24.61, ["X"] = 24.61,
["Y"] = 47.73, ["Y"] = 47.73,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 26.03, ["X"] = 26.03,
["Y"] = 47.65, ["Y"] = 47.65,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 27.94, ["X"] = 27.94,
["Y"] = 47.19, ["Y"] = 47.19,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 27.39, ["X"] = 27.39,
["Y"] = 44.65, ["Y"] = 44.65,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 32.73, ["X"] = 32.73,
["Y"] = 43.41, ["Y"] = 43.41,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 31.98, ["X"] = 31.98,
["Y"] = 47.64, ["Y"] = 47.64,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 32.51, ["X"] = 32.51,
["Y"] = 38.82, ["Y"] = 38.82,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 31.03, ["X"] = 31.03,
["Y"] = 38.81, ["Y"] = 38.81,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 30.59, ["X"] = 30.59,
["Y"] = 39.67, ["Y"] = 39.67,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 30.03, ["X"] = 30.03,
["Y"] = 40.09, ["Y"] = 40.09,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 29.63, ["X"] = 29.63,
["Y"] = 41.35, ["Y"] = 41.35,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 28.81, ["X"] = 28.81,
["Y"] = 43.12, ["Y"] = 43.12,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 30.08, ["X"] = 30.08,
["Y"] = 45.64, ["Y"] = 45.64,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 30.28, ["X"] = 30.28,
["Y"] = 48.27, ["Y"] = 48.27,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 29.93, ["X"] = 29.93,
["Y"] = 47.4, ["Y"] = 47.4,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 28.94, ["X"] = 28.94,
["Y"] = 47.14, ["Y"] = 47.14,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 27.59, ["X"] = 27.59,
["Y"] = 45.29, ["Y"] = 45.29,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 30.01, ["X"] = 30.01,
["Y"] = 44.34, ["Y"] = 44.34,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 32.22, ["X"] = 32.22,
["Y"] = 39.24, ["Y"] = 39.24,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 31.38, ["X"] = 31.38,
["Y"] = 38.07, ["Y"] = 38.07,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 32.23, ["X"] = 32.23,
["Y"] = 36.98, ["Y"] = 36.98,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 31.55, ["X"] = 31.55,
["Y"] = 31.57, ["Y"] = 31.57,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 30.92, ["X"] = 30.92,
["Y"] = 34.67, ["Y"] = 34.67,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 47.19, ["X"] = 47.19,
["Y"] = 39.83, ["Y"] = 39.83,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 50.82, ["X"] = 50.82,
["Y"] = 40.62, ["Y"] = 40.62,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 48.38, ["X"] = 48.38,
["Y"] = 34.1, ["Y"] = 34.1,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 45.59, ["X"] = 45.59,
["Y"] = 31.09, ["Y"] = 31.09,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 43.61, ["X"] = 43.61,
["Y"] = 35.49, ["Y"] = 35.49,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 35.64, ["X"] = 35.64,
["Y"] = 41.64, ["Y"] = 41.64,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 34.44, ["X"] = 34.44,
["Y"] = 43, ["Y"] = 43,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 47.66, ["X"] = 47.66,
["Y"] = 49.41, ["Y"] = 49.41,
["CD"] = 0 ["CD"] = 0,
}, },
[50] = [50] = {
{
["X"] = 48.82, ["X"] = 48.82,
["Y"] = 47.86, ["Y"] = 47.86,
["CD"] = 0 ["CD"] = 0,
}, },
[51] = [51] = {
{
["X"] = 44.12, ["X"] = 44.12,
["Y"] = 47.05, ["Y"] = 47.05,
["CD"] = 0 ["CD"] = 0,
}, },
[52] = [52] = {
{
["X"] = 43.09, ["X"] = 43.09,
["Y"] = 48.75, ["Y"] = 48.75,
["CD"] = 0 ["CD"] = 0,
}, },
[53] = [53] = {
{
["X"] = 40.23, ["X"] = 40.23,
["Y"] = 47.62, ["Y"] = 47.62,
["CD"] = 0 ["CD"] = 0,
}, },
[54] = [54] = {
{
["X"] = 37.28, ["X"] = 37.28,
["Y"] = 50.18, ["Y"] = 50.18,
["CD"] = 0 ["CD"] = 0,
}, },
[55] = [55] = {
{
["X"] = 36.33, ["X"] = 36.33,
["Y"] = 56.29, ["Y"] = 56.29,
["CD"] = 0 ["CD"] = 0,
}, },
[56] = [56] = {
{
["X"] = 38.4, ["X"] = 38.4,
["Y"] = 56.36, ["Y"] = 56.36,
["CD"] = 0 ["CD"] = 0,
}, },
[57] = [57] = {
{
["X"] = 40.05, ["X"] = 40.05,
["Y"] = 56.12, ["Y"] = 56.12,
["CD"] = 0 ["CD"] = 0,
}, },
[58] = [58] = {
{
["X"] = 39.51, ["X"] = 39.51,
["Y"] = 57.12, ["Y"] = 57.12,
["CD"] = 0 ["CD"] = 0,
}, },
[59] = [59] = {
{
["X"] = 39.43, ["X"] = 39.43,
["Y"] = 54.75, ["Y"] = 54.75,
["CD"] = 0 ["CD"] = 0,
}, },
[60] = [60] = {
{
["X"] = 38.8, ["X"] = 38.8,
["Y"] = 51.65, ["Y"] = 51.65,
["CD"] = 0 ["CD"] = 0,
}, },
[61] = [61] = {
{
["X"] = 38.74, ["X"] = 38.74,
["Y"] = 53.13, ["Y"] = 53.13,
["CD"] = 0 ["CD"] = 0,
}, },
[62] = [62] = {
{
["X"] = 38.11, ["X"] = 38.11,
["Y"] = 53.06, ["Y"] = 53.06,
["CD"] = 0 ["CD"] = 0,
}, },
[63] = [63] = {
{
["X"] = 36.71, ["X"] = 36.71,
["Y"] = 53.46, ["Y"] = 53.46,
["CD"] = 0 ["CD"] = 0,
}, },
[64] = [64] = {
{
["X"] = 36.17, ["X"] = 36.17,
["Y"] = 53.81, ["Y"] = 53.81,
["CD"] = 0 ["CD"] = 0,
}, },
[65] = [65] = {
{
["X"] = 34.25, ["X"] = 34.25,
["Y"] = 55.15, ["Y"] = 55.15,
["CD"] = 0 ["CD"] = 0,
}, },
[66] = [66] = {
{
["X"] = 35.35, ["X"] = 35.35,
["Y"] = 54.5, ["Y"] = 54.5,
["CD"] = 0 ["CD"] = 0,
}, },
[67] = [67] = {
{
["X"] = 35.27, ["X"] = 35.27,
["Y"] = 52.65, ["Y"] = 52.65,
["CD"] = 0 ["CD"] = 0,
}, },
[68] = [68] = {
{
["X"] = 32.47, ["X"] = 32.47,
["Y"] = 45.01, ["Y"] = 45.01,
["CD"] = 0 ["CD"] = 0,
}, },
[69] = [69] = {
{
["X"] = 34.72, ["X"] = 34.72,
["Y"] = 47.72, ["Y"] = 47.72,
["CD"] = 0 ["CD"] = 0,
}, },
[70] = [70] = {
{
["X"] = 36.55, ["X"] = 36.55,
["Y"] = 51.57, ["Y"] = 51.57,
["CD"] = 0 ["CD"] = 0,
}, },
[71] = [71] = {
{
["X"] = 70.42, ["X"] = 70.42,
["Y"] = 64.46, ["Y"] = 64.46,
["CD"] = 0 ["CD"] = 0,
}, },
[72] = [72] = {
{
["X"] = 64.84, ["X"] = 64.84,
["Y"] = 55.38, ["Y"] = 55.38,
["CD"] = 0 ["CD"] = 0,
}, },
[73] = [73] = {
{
["X"] = 44.86, ["X"] = 44.86,
["Y"] = 48.82, ["Y"] = 48.82,
["CD"] = 0 ["CD"] = 0,
}, },
[74] = [74] = {
{
["X"] = 29.45, ["X"] = 29.45,
["Y"] = 77.91, ["Y"] = 77.91,
["CD"] = 0 ["CD"] = 0,
}, },
[75] = [75] = {
{
["X"] = 29.8, ["X"] = 29.8,
["Y"] = 70.65, ["Y"] = 70.65,
["CD"] = 0 ["CD"] = 0,
}, },
[76] = [76] = {
{
["X"] = 44.01, ["X"] = 44.01,
["Y"] = 41.2, ["Y"] = 41.2,
["CD"] = 0 ["CD"] = 0,
}, },
[77] = [77] = {
{
["X"] = 41.54, ["X"] = 41.54,
["Y"] = 40.12, ["Y"] = 40.12,
["CD"] = 0 ["CD"] = 0,
}, },
[78] = [78] = {
{
["X"] = 20.2, ["X"] = 20.2,
["Y"] = 53.96, ["Y"] = 53.96,
["CD"] = 0 ["CD"] = 0,
}, },
[79] = [79] = {
{
["X"] = 31.44, ["X"] = 31.44,
["Y"] = 29.22, ["Y"] = 29.22,
["CD"] = 0 ["CD"] = 0,
}, },
[80] = [80] = {
{
["X"] = 15.67, ["X"] = 15.67,
["Y"] = 37.13, ["Y"] = 37.13,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 50 aura_env.wipeDistance = 50
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,407 +1,340 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 20.97, ["X"] = 20.97,
["Y"] = 15.47, ["Y"] = 15.47,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 27.52, ["X"] = 27.52,
["Y"] = 9.17, ["Y"] = 9.17,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 25.93, ["X"] = 25.93,
["Y"] = 25.58, ["Y"] = 25.58,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 34.07, ["X"] = 34.07,
["Y"] = 50.83, ["Y"] = 50.83,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 37.23, ["X"] = 37.23,
["Y"] = 54.85, ["Y"] = 54.85,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 34.77, ["X"] = 34.77,
["Y"] = 58.4, ["Y"] = 58.4,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 39.56, ["X"] = 39.56,
["Y"] = 79.48, ["Y"] = 79.48,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 66.46, ["X"] = 66.46,
["Y"] = 57.51, ["Y"] = 57.51,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 66.74, ["X"] = 66.74,
["Y"] = 66.02, ["Y"] = 66.02,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 71.94, ["X"] = 71.94,
["Y"] = 68.81, ["Y"] = 68.81,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 69.51, ["X"] = 69.51,
["Y"] = 67.83, ["Y"] = 67.83,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 69.31, ["X"] = 69.31,
["Y"] = 50.72, ["Y"] = 50.72,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 63.31, ["X"] = 63.31,
["Y"] = 53.33, ["Y"] = 53.33,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 63.96, ["X"] = 63.96,
["Y"] = 50.46, ["Y"] = 50.46,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 65.37, ["X"] = 65.37,
["Y"] = 43.82, ["Y"] = 43.82,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 63.15, ["X"] = 63.15,
["Y"] = 35.17, ["Y"] = 35.17,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 60.59, ["X"] = 60.59,
["Y"] = 44.44, ["Y"] = 44.44,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 35.55, ["X"] = 35.55,
["Y"] = 61.86, ["Y"] = 61.86,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 40.1, ["X"] = 40.1,
["Y"] = 53.5, ["Y"] = 53.5,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 47.46, ["X"] = 47.46,
["Y"] = 47.36, ["Y"] = 47.36,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 49.48, ["X"] = 49.48,
["Y"] = 39.04, ["Y"] = 39.04,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 35.79, ["X"] = 35.79,
["Y"] = 42.74, ["Y"] = 42.74,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 33.35, ["X"] = 33.35,
["Y"] = 45.99, ["Y"] = 45.99,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 30.25, ["X"] = 30.25,
["Y"] = 43.1, ["Y"] = 43.1,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 28.76, ["X"] = 28.76,
["Y"] = 48.41, ["Y"] = 48.41,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 30.18, ["X"] = 30.18,
["Y"] = 65.31, ["Y"] = 65.31,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 32.64, ["X"] = 32.64,
["Y"] = 74.92, ["Y"] = 74.92,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 35.41, ["X"] = 35.41,
["Y"] = 80.33, ["Y"] = 80.33,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 32.08, ["X"] = 32.08,
["Y"] = 81.08, ["Y"] = 81.08,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 30.03, ["X"] = 30.03,
["Y"] = 82.65, ["Y"] = 82.65,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 27.52, ["X"] = 27.52,
["Y"] = 67.32, ["Y"] = 67.32,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 26.24, ["X"] = 26.24,
["Y"] = 69.06, ["Y"] = 69.06,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 24.97, ["X"] = 24.97,
["Y"] = 61.8, ["Y"] = 61.8,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 25.91, ["X"] = 25.91,
["Y"] = 58.23, ["Y"] = 58.23,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 34.69, ["X"] = 34.69,
["Y"] = 39.51, ["Y"] = 39.51,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 37.45, ["X"] = 37.45,
["Y"] = 38.69, ["Y"] = 38.69,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 45.96, ["X"] = 45.96,
["Y"] = 36.33, ["Y"] = 36.33,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 46.54, ["X"] = 46.54,
["Y"] = 33.81, ["Y"] = 33.81,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 37.6, ["X"] = 37.6,
["Y"] = 31.35, ["Y"] = 31.35,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 24.73, ["X"] = 24.73,
["Y"] = 54.01, ["Y"] = 54.01,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 21.68, ["X"] = 21.68,
["Y"] = 47.55, ["Y"] = 47.55,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 23.58, ["X"] = 23.58,
["Y"] = 50.81, ["Y"] = 50.81,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 25.01, ["X"] = 25.01,
["Y"] = 35.96, ["Y"] = 35.96,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 25.25, ["X"] = 25.25,
["Y"] = 37.61, ["Y"] = 37.61,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 41.53, ["X"] = 41.53,
["Y"] = 17.47, ["Y"] = 17.47,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 27.84, ["X"] = 27.84,
["Y"] = 15.94, ["Y"] = 15.94,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 44.1, ["X"] = 44.1,
["Y"] = 24.69, ["Y"] = 24.69,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 41.45, ["X"] = 41.45,
["Y"] = 24.26, ["Y"] = 24.26,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 40.28, ["X"] = 40.28,
["Y"] = 27.75, ["Y"] = 27.75,
["CD"] = 0 ["CD"] = 0,
}, },
[50] = [50] = {
{
["X"] = 37.57, ["X"] = 37.57,
["Y"] = 27.05, ["Y"] = 27.05,
["CD"] = 0 ["CD"] = 0,
}, },
[51] = [51] = {
{
["X"] = 33.71, ["X"] = 33.71,
["Y"] = 31.04, ["Y"] = 31.04,
["CD"] = 0 ["CD"] = 0,
}, },
[52] = [52] = {
{
["X"] = 28.85, ["X"] = 28.85,
["Y"] = 29.61, ["Y"] = 29.61,
["CD"] = 0 ["CD"] = 0,
}, },
[53] = [53] = {
{
["X"] = 27.2, ["X"] = 27.2,
["Y"] = 29.85, ["Y"] = 29.85,
["CD"] = 0 ["CD"] = 0,
}, },
[54] = [54] = {
{
["X"] = 23.31, ["X"] = 23.31,
["Y"] = 34.44, ["Y"] = 34.44,
["CD"] = 0 ["CD"] = 0,
}, },
[55] = [55] = {
{
["X"] = 15.86, ["X"] = 15.86,
["Y"] = 43.89, ["Y"] = 43.89,
["CD"] = 0 ["CD"] = 0,
}, },
[56] = [56] = {
{
["X"] = 16.17, ["X"] = 16.17,
["Y"] = 39.56, ["Y"] = 39.56,
["CD"] = 0 ["CD"] = 0,
}, },
[57] = [57] = {
{
["X"] = 16.88, ["X"] = 16.88,
["Y"] = 28.87, ["Y"] = 28.87,
["CD"] = 0 ["CD"] = 0,
}, },
[58] = [58] = {
{
["X"] = 19.56, ["X"] = 19.56,
["Y"] = 18.08, ["Y"] = 18.08,
["CD"] = 0 ["CD"] = 0,
}, },
[59] = [59] = {
{
["X"] = 19.99, ["X"] = 19.99,
["Y"] = 18.12, ["Y"] = 18.12,
["CD"] = 0 ["CD"] = 0,
}, },
[60] = [60] = {
{
["X"] = 49.54, ["X"] = 49.54,
["Y"] = 43.54, ["Y"] = 43.54,
["CD"] = 0 ["CD"] = 0,
}, },
[61] = [61] = {
{
["X"] = 55.47, ["X"] = 55.47,
["Y"] = 40.72, ["Y"] = 40.72,
["CD"] = 0 ["CD"] = 0,
}, },
[62] = [62] = {
{
["X"] = 57.64, ["X"] = 57.64,
["Y"] = 37.85, ["Y"] = 37.85,
["CD"] = 0 ["CD"] = 0,
}, },
[63] = [63] = {
{
["X"] = 62.48, ["X"] = 62.48,
["Y"] = 57.85, ["Y"] = 57.85,
["CD"] = 0 ["CD"] = 0,
}, },
[64] = [64] = {
{
["X"] = 63.78, ["X"] = 63.78,
["Y"] = 60.52, ["Y"] = 60.52,
["CD"] = 0 ["CD"] = 0,
}, },
[65] = [65] = {
{
["X"] = 50.61, ["X"] = 50.61,
["Y"] = 60.74, ["Y"] = 60.74,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 50 aura_env.wipeDistance = 50
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1530,12 +1530,11 @@ aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,437 +1,365 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 64.49, ["X"] = 64.49,
["Y"] = 56.55, ["Y"] = 56.55,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 63.79, ["X"] = 63.79,
["Y"] = 54.73, ["Y"] = 54.73,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 61.99, ["X"] = 61.99,
["Y"] = 53.82, ["Y"] = 53.82,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 61.48, ["X"] = 61.48,
["Y"] = 49.4, ["Y"] = 49.4,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 61.46, ["X"] = 61.46,
["Y"] = 47.17, ["Y"] = 47.17,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 59.23, ["X"] = 59.23,
["Y"] = 46.84, ["Y"] = 46.84,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 56.86, ["X"] = 56.86,
["Y"] = 45.6, ["Y"] = 45.6,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 55.78, ["X"] = 55.78,
["Y"] = 44.91, ["Y"] = 44.91,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 55.06, ["X"] = 55.06,
["Y"] = 34.48, ["Y"] = 34.48,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 56.92, ["X"] = 56.92,
["Y"] = 34.22, ["Y"] = 34.22,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 59, ["X"] = 59,
["Y"] = 34.83, ["Y"] = 34.83,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 60.2, ["X"] = 60.2,
["Y"] = 36.57, ["Y"] = 36.57,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 61.85, ["X"] = 61.85,
["Y"] = 36.99, ["Y"] = 36.99,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 64.38, ["X"] = 64.38,
["Y"] = 35.48, ["Y"] = 35.48,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 66.81, ["X"] = 66.81,
["Y"] = 36.14, ["Y"] = 36.14,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 67.47, ["X"] = 67.47,
["Y"] = 35.67, ["Y"] = 35.67,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 69.55, ["X"] = 69.55,
["Y"] = 37.38, ["Y"] = 37.38,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 69.25, ["X"] = 69.25,
["Y"] = 37.57, ["Y"] = 37.57,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 68.77, ["X"] = 68.77,
["Y"] = 39.03, ["Y"] = 39.03,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 70.23, ["X"] = 70.23,
["Y"] = 39.53, ["Y"] = 39.53,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 72.53, ["X"] = 72.53,
["Y"] = 40.98, ["Y"] = 40.98,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 77.18, ["X"] = 77.18,
["Y"] = 44.12, ["Y"] = 44.12,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 77.7, ["X"] = 77.7,
["Y"] = 50.51, ["Y"] = 50.51,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 77.21, ["X"] = 77.21,
["Y"] = 49.87, ["Y"] = 49.87,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 77.8, ["X"] = 77.8,
["Y"] = 48.72, ["Y"] = 48.72,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 77.04, ["X"] = 77.04,
["Y"] = 47.98, ["Y"] = 47.98,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 74.84, ["X"] = 74.84,
["Y"] = 48.86, ["Y"] = 48.86,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 74.71, ["X"] = 74.71,
["Y"] = 49.87, ["Y"] = 49.87,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 77.44, ["X"] = 77.44,
["Y"] = 51.67, ["Y"] = 51.67,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 78.28, ["X"] = 78.28,
["Y"] = 52.79, ["Y"] = 52.79,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 76.61, ["X"] = 76.61,
["Y"] = 56.1, ["Y"] = 56.1,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 78.15, ["X"] = 78.15,
["Y"] = 58.13, ["Y"] = 58.13,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 77.88, ["X"] = 77.88,
["Y"] = 59.33, ["Y"] = 59.33,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 78.99, ["X"] = 78.99,
["Y"] = 59.38, ["Y"] = 59.38,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 78.7, ["X"] = 78.7,
["Y"] = 61.8, ["Y"] = 61.8,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 80.81, ["X"] = 80.81,
["Y"] = 62.57, ["Y"] = 62.57,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 80.67, ["X"] = 80.67,
["Y"] = 63.24, ["Y"] = 63.24,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 81.77, ["X"] = 81.77,
["Y"] = 64.74, ["Y"] = 64.74,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 81.61, ["X"] = 81.61,
["Y"] = 67.37, ["Y"] = 67.37,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 80.59, ["X"] = 80.59,
["Y"] = 69.27, ["Y"] = 69.27,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 54.85, ["X"] = 54.85,
["Y"] = 78.82, ["Y"] = 78.82,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 54.64, ["X"] = 54.64,
["Y"] = 77.06, ["Y"] = 77.06,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 54.11, ["X"] = 54.11,
["Y"] = 76.34, ["Y"] = 76.34,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 52.14, ["X"] = 52.14,
["Y"] = 71.88, ["Y"] = 71.88,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 49.89, ["X"] = 49.89,
["Y"] = 61.13, ["Y"] = 61.13,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 49.47, ["X"] = 49.47,
["Y"] = 56.45, ["Y"] = 56.45,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 49.33, ["X"] = 49.33,
["Y"] = 52.48, ["Y"] = 52.48,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 49.79, ["X"] = 49.79,
["Y"] = 47.5, ["Y"] = 47.5,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 78.74, ["X"] = 78.74,
["Y"] = 32.35, ["Y"] = 32.35,
["CD"] = 0 ["CD"] = 0,
}, },
[50] = [50] = {
{
["X"] = 76.86, ["X"] = 76.86,
["Y"] = 33.06, ["Y"] = 33.06,
["CD"] = 0 ["CD"] = 0,
}, },
[51] = [51] = {
{
["X"] = 74.67, ["X"] = 74.67,
["Y"] = 37.87, ["Y"] = 37.87,
["CD"] = 0 ["CD"] = 0,
}, },
[52] = [52] = {
{
["X"] = 74.93, ["X"] = 74.93,
["Y"] = 41.16, ["Y"] = 41.16,
["CD"] = 0 ["CD"] = 0,
}, },
[53] = [53] = {
{
["X"] = 70.73, ["X"] = 70.73,
["Y"] = 43.54, ["Y"] = 43.54,
["CD"] = 0 ["CD"] = 0,
}, },
[54] = [54] = {
{
["X"] = 70.35, ["X"] = 70.35,
["Y"] = 45.76, ["Y"] = 45.76,
["CD"] = 0 ["CD"] = 0,
}, },
[55] = [55] = {
{
["X"] = 37.66, ["X"] = 37.66,
["Y"] = 22.47, ["Y"] = 22.47,
["CD"] = 0 ["CD"] = 0,
}, },
[56] = [56] = {
{
["X"] = 36.85, ["X"] = 36.85,
["Y"] = 26.28, ["Y"] = 26.28,
["CD"] = 0 ["CD"] = 0,
}, },
[57] = [57] = {
{
["X"] = 33.63, ["X"] = 33.63,
["Y"] = 29.7, ["Y"] = 29.7,
["CD"] = 0 ["CD"] = 0,
}, },
[58] = [58] = {
{
["X"] = 31.25, ["X"] = 31.25,
["Y"] = 33.5, ["Y"] = 33.5,
["CD"] = 0 ["CD"] = 0,
}, },
[59] = [59] = {
{
["X"] = 29, ["X"] = 29,
["Y"] = 41.91, ["Y"] = 41.91,
["CD"] = 0 ["CD"] = 0,
}, },
[60] = [60] = {
{
["X"] = 27.51, ["X"] = 27.51,
["Y"] = 43.03, ["Y"] = 43.03,
["CD"] = 0 ["CD"] = 0,
}, },
[61] = [61] = {
{
["X"] = 29.19, ["X"] = 29.19,
["Y"] = 44.39, ["Y"] = 44.39,
["CD"] = 0 ["CD"] = 0,
}, },
[62] = [62] = {
{
["X"] = 30.22, ["X"] = 30.22,
["Y"] = 46.68, ["Y"] = 46.68,
["CD"] = 0 ["CD"] = 0,
}, },
[63] = [63] = {
{
["X"] = 30.56, ["X"] = 30.56,
["Y"] = 60.35, ["Y"] = 60.35,
["CD"] = 0 ["CD"] = 0,
}, },
[64] = [64] = {
{
["X"] = 31.8, ["X"] = 31.8,
["Y"] = 62.23, ["Y"] = 62.23,
["CD"] = 0 ["CD"] = 0,
}, },
[65] = [65] = {
{
["X"] = 32.24, ["X"] = 32.24,
["Y"] = 64.21, ["Y"] = 64.21,
["CD"] = 0 ["CD"] = 0,
}, },
[66] = [66] = {
{
["X"] = 33, ["X"] = 33,
["Y"] = 66.87, ["Y"] = 66.87,
["CD"] = 0 ["CD"] = 0,
}, },
[67] = [67] = {
{
["X"] = 35.52, ["X"] = 35.52,
["Y"] = 69.32, ["Y"] = 69.32,
["CD"] = 0 ["CD"] = 0,
}, },
[68] = [68] = {
{
["X"] = 33.51, ["X"] = 33.51,
["Y"] = 70.23, ["Y"] = 70.23,
["CD"] = 0 ["CD"] = 0,
}, },
[69] = [69] = {
{
["X"] = 32.51, ["X"] = 32.51,
["Y"] = 67.22, ["Y"] = 67.22,
["CD"] = 0 ["CD"] = 0,
}, },
[70] = [70] = {
{
["X"] = 30.69, ["X"] = 30.69,
["Y"] = 67.28, ["Y"] = 67.28,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 600 aura_env.cooldown = 600
aura_env.wipeDistance = 50 aura_env.wipeDistance = 50
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,419 +1,350 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 55.21, ["X"] = 55.21,
["Y"] = 29.38, ["Y"] = 29.38,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 56.38, ["X"] = 56.38,
["Y"] = 30.8, ["Y"] = 30.8,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 54.25, ["X"] = 54.25,
["Y"] = 31.3, ["Y"] = 31.3,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 56.5, ["X"] = 56.5,
["Y"] = 32.12, ["Y"] = 32.12,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 58.44, ["X"] = 58.44,
["Y"] = 35.06, ["Y"] = 35.06,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 53.05, ["X"] = 53.05,
["Y"] = 37.22, ["Y"] = 37.22,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 52.92, ["X"] = 52.92,
["Y"] = 37.71, ["Y"] = 37.71,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 56.85, ["X"] = 56.85,
["Y"] = 37.89, ["Y"] = 37.89,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 59.32, ["X"] = 59.32,
["Y"] = 39.96, ["Y"] = 39.96,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 60.24, ["X"] = 60.24,
["Y"] = 43.26, ["Y"] = 43.26,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 62.38, ["X"] = 62.38,
["Y"] = 44.15, ["Y"] = 44.15,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 60.31, ["X"] = 60.31,
["Y"] = 44.75, ["Y"] = 44.75,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 62.63, ["X"] = 62.63,
["Y"] = 45, ["Y"] = 45,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 58.79, ["X"] = 58.79,
["Y"] = 66.11, ["Y"] = 66.11,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 58.07, ["X"] = 58.07,
["Y"] = 67.24, ["Y"] = 67.24,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 58.8, ["X"] = 58.8,
["Y"] = 68.04, ["Y"] = 68.04,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 56.18, ["X"] = 56.18,
["Y"] = 68.4, ["Y"] = 68.4,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 56.89, ["X"] = 56.89,
["Y"] = 68.83, ["Y"] = 68.83,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 55.99, ["X"] = 55.99,
["Y"] = 68.92, ["Y"] = 68.92,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 54.79, ["X"] = 54.79,
["Y"] = 69.16, ["Y"] = 69.16,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 78.12, ["X"] = 78.12,
["Y"] = 69.46, ["Y"] = 69.46,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 55.23, ["X"] = 55.23,
["Y"] = 69.82, ["Y"] = 69.82,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 56.47, ["X"] = 56.47,
["Y"] = 69.86, ["Y"] = 69.86,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 78.49, ["X"] = 78.49,
["Y"] = 70, ["Y"] = 70,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 57.49, ["X"] = 57.49,
["Y"] = 70.1, ["Y"] = 70.1,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 62.05, ["X"] = 62.05,
["Y"] = 70.16, ["Y"] = 70.16,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 53.23, ["X"] = 53.23,
["Y"] = 70.74, ["Y"] = 70.74,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 55.72, ["X"] = 55.72,
["Y"] = 70.85, ["Y"] = 70.85,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 60.45, ["X"] = 60.45,
["Y"] = 70.99, ["Y"] = 70.99,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 78.71, ["X"] = 78.71,
["Y"] = 71.05, ["Y"] = 71.05,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 59.93, ["X"] = 59.93,
["Y"] = 71.54, ["Y"] = 71.54,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 60.96, ["X"] = 60.96,
["Y"] = 71.64, ["Y"] = 71.64,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 78.05, ["X"] = 78.05,
["Y"] = 71.69, ["Y"] = 71.69,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 53.97, ["X"] = 53.97,
["Y"] = 71.7, ["Y"] = 71.7,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 58.78, ["X"] = 58.78,
["Y"] = 71.92, ["Y"] = 71.92,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 59.19, ["X"] = 59.19,
["Y"] = 72.7, ["Y"] = 72.7,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 57.1, ["X"] = 57.1,
["Y"] = 72.76, ["Y"] = 72.76,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 63.61, ["X"] = 63.61,
["Y"] = 73.32, ["Y"] = 73.32,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 57.6, ["X"] = 57.6,
["Y"] = 73.39, ["Y"] = 73.39,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 55.82, ["X"] = 55.82,
["Y"] = 73.97, ["Y"] = 73.97,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 56.83, ["X"] = 56.83,
["Y"] = 74.09, ["Y"] = 74.09,
["CD"] = 0 ["CD"] = 0,
}, },
[42] = [42] = {
{
["X"] = 59.48, ["X"] = 59.48,
["Y"] = 75.05, ["Y"] = 75.05,
["CD"] = 0 ["CD"] = 0,
}, },
[43] = [43] = {
{
["X"] = 57.28, ["X"] = 57.28,
["Y"] = 75.33, ["Y"] = 75.33,
["CD"] = 0 ["CD"] = 0,
}, },
[44] = [44] = {
{
["X"] = 56.2, ["X"] = 56.2,
["Y"] = 75.37, ["Y"] = 75.37,
["CD"] = 0 ["CD"] = 0,
}, },
[45] = [45] = {
{
["X"] = 65.04, ["X"] = 65.04,
["Y"] = 75.73, ["Y"] = 75.73,
["CD"] = 0 ["CD"] = 0,
}, },
[46] = [46] = {
{
["X"] = 57.1, ["X"] = 57.1,
["Y"] = 75.83, ["Y"] = 75.83,
["CD"] = 0 ["CD"] = 0,
}, },
[47] = [47] = {
{
["X"] = 64.03, ["X"] = 64.03,
["Y"] = 76.03, ["Y"] = 76.03,
["CD"] = 0 ["CD"] = 0,
}, },
[48] = [48] = {
{
["X"] = 65.94, ["X"] = 65.94,
["Y"] = 76.67, ["Y"] = 76.67,
["CD"] = 0 ["CD"] = 0,
}, },
[49] = [49] = {
{
["X"] = 60.04, ["X"] = 60.04,
["Y"] = 76.75, ["Y"] = 76.75,
["CD"] = 0 ["CD"] = 0,
}, },
[50] = [50] = {
{
["X"] = 51.69, ["X"] = 51.69,
["Y"] = 77.08, ["Y"] = 77.08,
["CD"] = 0 ["CD"] = 0,
}, },
[51] = [51] = {
{
["X"] = 66.38, ["X"] = 66.38,
["Y"] = 77.13, ["Y"] = 77.13,
["CD"] = 0 ["CD"] = 0,
}, },
[52] = [52] = {
{
["X"] = 61.34, ["X"] = 61.34,
["Y"] = 77.69, ["Y"] = 77.69,
["CD"] = 0 ["CD"] = 0,
}, },
[53] = [53] = {
{
["X"] = 56.96, ["X"] = 56.96,
["Y"] = 77.71, ["Y"] = 77.71,
["CD"] = 0 ["CD"] = 0,
}, },
[54] = [54] = {
{
["X"] = 63.81, ["X"] = 63.81,
["Y"] = 77.73, ["Y"] = 77.73,
["CD"] = 0 ["CD"] = 0,
}, },
[55] = [55] = {
{
["X"] = 65.79, ["X"] = 65.79,
["Y"] = 77.78, ["Y"] = 77.78,
["CD"] = 0 ["CD"] = 0,
}, },
[56] = [56] = {
{
["X"] = 66.91, ["X"] = 66.91,
["Y"] = 78.43, ["Y"] = 78.43,
["CD"] = 0 ["CD"] = 0,
}, },
[57] = [57] = {
{
["X"] = 64.63, ["X"] = 64.63,
["Y"] = 79.29, ["Y"] = 79.29,
["CD"] = 0 ["CD"] = 0,
}, },
[58] = [58] = {
{
["X"] = 63.47, ["X"] = 63.47,
["Y"] = 79.63, ["Y"] = 79.63,
["CD"] = 0 ["CD"] = 0,
}, },
[59] = [59] = {
{
["X"] = 61.37, ["X"] = 61.37,
["Y"] = 79.81, ["Y"] = 79.81,
["CD"] = 0 ["CD"] = 0,
}, },
[60] = [60] = {
{
["X"] = 60.47, ["X"] = 60.47,
["Y"] = 80.35, ["Y"] = 80.35,
["CD"] = 0 ["CD"] = 0,
}, },
[61] = [61] = {
{
["X"] = 62.7, ["X"] = 62.7,
["Y"] = 80.54, ["Y"] = 80.54,
["CD"] = 0 ["CD"] = 0,
}, },
[62] = [62] = {
{
["X"] = 70.7, ["X"] = 70.7,
["Y"] = 80.98, ["Y"] = 80.98,
["CD"] = 0 ["CD"] = 0,
}, },
[63] = [63] = {
{
["X"] = 60.52, ["X"] = 60.52,
["Y"] = 81.06, ["Y"] = 81.06,
["CD"] = 0 ["CD"] = 0,
}, },
[64] = [64] = {
{
["X"] = 72.19, ["X"] = 72.19,
["Y"] = 82.3, ["Y"] = 82.3,
["CD"] = 0 ["CD"] = 0,
}, },
[65] = [65] = {
{
["X"] = 71.35, ["X"] = 71.35,
["Y"] = 82.53, ["Y"] = 82.53,
["CD"] = 0 ["CD"] = 0,
}, },
[66] = [66] = {
{
["X"] = 67.39, ["X"] = 67.39,
["Y"] = 83.15, ["Y"] = 83.15,
["CD"] = 0 ["CD"] = 0,
}, },
[67] = [67] = {
{
["X"] = 71.42, ["X"] = 71.42,
["Y"] = 84.27, ["Y"] = 84.27,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 92 aura_env.cooldown = 92
aura_env.wipeDistance = 15 aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,124 +1,103 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 51.58, ["X"] = 51.58,
["Y"] = 43.53, ["Y"] = 43.53,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 51.71, ["X"] = 51.71,
["Y"] = 43.97, ["Y"] = 43.97,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 52.19, ["X"] = 52.19,
["Y"] = 43.75, ["Y"] = 43.75,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 53.1, ["X"] = 53.1,
["Y"] = 43.07, ["Y"] = 43.07,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 53.56, ["X"] = 53.56,
["Y"] = 43.28, ["Y"] = 43.28,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 54.06, ["X"] = 54.06,
["Y"] = 43.34, ["Y"] = 43.34,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 54.63, ["X"] = 54.63,
["Y"] = 43.33, ["Y"] = 43.33,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 54.84, ["X"] = 54.84,
["Y"] = 42.4, ["Y"] = 42.4,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 54.89, ["X"] = 54.89,
["Y"] = 41.74, ["Y"] = 41.74,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 54.53, ["X"] = 54.53,
["Y"] = 41.47, ["Y"] = 41.47,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 54.27, ["X"] = 54.27,
["Y"] = 41.65, ["Y"] = 41.65,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 53.86, ["X"] = 53.86,
["Y"] = 41.66, ["Y"] = 41.66,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 53.74, ["X"] = 53.74,
["Y"] = 40.67, ["Y"] = 40.67,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 52.95, ["X"] = 52.95,
["Y"] = 40.72, ["Y"] = 40.72,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 52.78, ["X"] = 52.78,
["Y"] = 40.24, ["Y"] = 40.24,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 47.99, ["X"] = 47.99,
["Y"] = 45.57, ["Y"] = 45.57,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 47.57, ["X"] = 47.57,
["Y"] = 45.29, ["Y"] = 45.29,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 47.57, ["X"] = 47.57,
["Y"] = 45.38, ["Y"] = 45.38,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 48.18, ["X"] = 48.18,
["Y"] = 46.31, ["Y"] = 46.31,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 47.05, ["X"] = 47.05,
["Y"] = 46.63, ["Y"] = 46.63,
["CD"] = 0 ["CD"] = 0,
}, },
} }
aura_env.cooldown = 120 aura_env.cooldown = 120
@@ -126,12 +105,11 @@ aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,124 +1,103 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 47.45, ["X"] = 47.45,
["Y"] = 45.25, ["Y"] = 45.25,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 47.1, ["X"] = 47.1,
["Y"] = 45.39, ["Y"] = 45.39,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 46.85, ["X"] = 46.85,
["Y"] = 45.64, ["Y"] = 45.64,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 47.26, ["X"] = 47.26,
["Y"] = 46.21, ["Y"] = 46.21,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 46.37, ["X"] = 46.37,
["Y"] = 46.44, ["Y"] = 46.44,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 46.23, ["X"] = 46.23,
["Y"] = 47.2, ["Y"] = 47.2,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 46.35, ["X"] = 46.35,
["Y"] = 48, ["Y"] = 48,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 46.92, ["X"] = 46.92,
["Y"] = 48.29, ["Y"] = 48.29,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 47.02, ["X"] = 47.02,
["Y"] = 47.71, ["Y"] = 47.71,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 47.28, ["X"] = 47.28,
["Y"] = 47.65, ["Y"] = 47.65,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 47.45, ["X"] = 47.45,
["Y"] = 47.47, ["Y"] = 47.47,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 47.55, ["X"] = 47.55,
["Y"] = 47.42, ["Y"] = 47.42,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 47.84, ["X"] = 47.84,
["Y"] = 46.89, ["Y"] = 46.89,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 48.13, ["X"] = 48.13,
["Y"] = 46.47, ["Y"] = 46.47,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 48.24, ["X"] = 48.24,
["Y"] = 45.63, ["Y"] = 45.63,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 47.99, ["X"] = 47.99,
["Y"] = 45.57, ["Y"] = 45.57,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 47.57, ["X"] = 47.57,
["Y"] = 45.29, ["Y"] = 45.29,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 47.57, ["X"] = 47.57,
["Y"] = 45.38, ["Y"] = 45.38,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 48.18, ["X"] = 48.18,
["Y"] = 46.31, ["Y"] = 46.31,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 47.05, ["X"] = 47.05,
["Y"] = 46.63, ["Y"] = 46.63,
["CD"] = 0 ["CD"] = 0,
}, },
} }
aura_env.cooldown = 120 aura_env.cooldown = 120
@@ -126,12 +105,11 @@ aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,124 +1,103 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 47.58, ["X"] = 47.58,
["Y"] = 61.98, ["Y"] = 61.98,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 47.75, ["X"] = 47.75,
["Y"] = 61.61, ["Y"] = 61.61,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 49.39, ["X"] = 49.39,
["Y"] = 61.5, ["Y"] = 61.5,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 48.9, ["X"] = 48.9,
["Y"] = 60.63, ["Y"] = 60.63,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 49.1, ["X"] = 49.1,
["Y"] = 59.96, ["Y"] = 59.96,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 49.51, ["X"] = 49.51,
["Y"] = 60.13, ["Y"] = 60.13,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 49.15, ["X"] = 49.15,
["Y"] = 58.8, ["Y"] = 58.8,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 49.67, ["X"] = 49.67,
["Y"] = 58.14, ["Y"] = 58.14,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 48.5, ["X"] = 48.5,
["Y"] = 58.18, ["Y"] = 58.18,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 48.18, ["X"] = 48.18,
["Y"] = 58.23, ["Y"] = 58.23,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 48.13, ["X"] = 48.13,
["Y"] = 58.66, ["Y"] = 58.66,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 47.72, ["X"] = 47.72,
["Y"] = 58.57, ["Y"] = 58.57,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 47.55, ["X"] = 47.55,
["Y"] = 59.51, ["Y"] = 59.51,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 47.97, ["X"] = 47.97,
["Y"] = 60.7, ["Y"] = 60.7,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 47.95, ["X"] = 47.95,
["Y"] = 60.92, ["Y"] = 60.92,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 47.99, ["X"] = 47.99,
["Y"] = 45.57, ["Y"] = 45.57,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 47.57, ["X"] = 47.57,
["Y"] = 45.29, ["Y"] = 45.29,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 47.57, ["X"] = 47.57,
["Y"] = 45.38, ["Y"] = 45.38,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 48.18, ["X"] = 48.18,
["Y"] = 46.31, ["Y"] = 46.31,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 47.05, ["X"] = 47.05,
["Y"] = 46.63, ["Y"] = 46.63,
["CD"] = 0 ["CD"] = 0,
}, },
} }
aura_env.cooldown = 120 aura_env.cooldown = 120
@@ -126,12 +105,11 @@ aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,124 +1,103 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 62.88, ["X"] = 62.88,
["Y"] = 54.49, ["Y"] = 54.49,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 62.75, ["X"] = 62.75,
["Y"] = 54, ["Y"] = 54,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 62.88, ["X"] = 62.88,
["Y"] = 53.13, ["Y"] = 53.13,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 62.88, ["X"] = 62.88,
["Y"] = 51.82, ["Y"] = 51.82,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 62.78, ["X"] = 62.78,
["Y"] = 51.54, ["Y"] = 51.54,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 62.44, ["X"] = 62.44,
["Y"] = 50.9, ["Y"] = 50.9,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 61.85, ["X"] = 61.85,
["Y"] = 50.94, ["Y"] = 50.94,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 61.45, ["X"] = 61.45,
["Y"] = 51.58, ["Y"] = 51.58,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 61.14, ["X"] = 61.14,
["Y"] = 51.67, ["Y"] = 51.67,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 61.08, ["X"] = 61.08,
["Y"] = 52.31, ["Y"] = 52.31,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 60.35, ["X"] = 60.35,
["Y"] = 51.69, ["Y"] = 51.69,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 60.05, ["X"] = 60.05,
["Y"] = 51.23, ["Y"] = 51.23,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 60.05, ["X"] = 60.05,
["Y"] = 52.29, ["Y"] = 52.29,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 59.53, ["X"] = 59.53,
["Y"] = 52.96, ["Y"] = 52.96,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 59.53, ["X"] = 59.53,
["Y"] = 53.51, ["Y"] = 53.51,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 47.99, ["X"] = 47.99,
["Y"] = 45.57, ["Y"] = 45.57,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 47.57, ["X"] = 47.57,
["Y"] = 45.29, ["Y"] = 45.29,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 47.57, ["X"] = 47.57,
["Y"] = 45.38, ["Y"] = 45.38,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 48.18, ["X"] = 48.18,
["Y"] = 46.31, ["Y"] = 46.31,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 47.05, ["X"] = 47.05,
["Y"] = 46.63, ["Y"] = 46.63,
["CD"] = 0 ["CD"] = 0,
}, },
} }
aura_env.cooldown = 120 aura_env.cooldown = 120
@@ -126,12 +105,11 @@ aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -1,263 +1,220 @@
aura_env.herbs = aura_env.herbs = {
{ [1] = {
[1] =
{
["X"] = 57.62, ["X"] = 57.62,
["Y"] = 72.45, ["Y"] = 72.45,
["CD"] = 0 ["CD"] = 0,
}, },
[2] = [2] = {
{
["X"] = 57.57, ["X"] = 57.57,
["Y"] = 72.49, ["Y"] = 72.49,
["CD"] = 0 ["CD"] = 0,
}, },
[3] = [3] = {
{
["X"] = 60.72, ["X"] = 60.72,
["Y"] = 70.21, ["Y"] = 70.21,
["CD"] = 0 ["CD"] = 0,
}, },
[4] = [4] = {
{
["X"] = 57.63, ["X"] = 57.63,
["Y"] = 72.53, ["Y"] = 72.53,
["CD"] = 0 ["CD"] = 0,
}, },
[5] = [5] = {
{
["X"] = 57.74, ["X"] = 57.74,
["Y"] = 72.2, ["Y"] = 72.2,
["CD"] = 0 ["CD"] = 0,
}, },
[6] = [6] = {
{
["X"] = 60.67, ["X"] = 60.67,
["Y"] = 70.3, ["Y"] = 70.3,
["CD"] = 0 ["CD"] = 0,
}, },
[7] = [7] = {
{
["X"] = 57.84, ["X"] = 57.84,
["Y"] = 72.45, ["Y"] = 72.45,
["CD"] = 0 ["CD"] = 0,
}, },
[8] = [8] = {
{
["X"] = 60.66, ["X"] = 60.66,
["Y"] = 70.92, ["Y"] = 70.92,
["CD"] = 0 ["CD"] = 0,
}, },
[9] = [9] = {
{
["X"] = 60.71, ["X"] = 60.71,
["Y"] = 70.26, ["Y"] = 70.26,
["CD"] = 0 ["CD"] = 0,
}, },
[10] = [10] = {
{
["X"] = 60.67, ["X"] = 60.67,
["Y"] = 70.19, ["Y"] = 70.19,
["CD"] = 0 ["CD"] = 0,
}, },
[11] = [11] = {
{
["X"] = 60.71, ["X"] = 60.71,
["Y"] = 70.31, ["Y"] = 70.31,
["CD"] = 0 ["CD"] = 0,
}, },
[12] = [12] = {
{
["X"] = 60.64, ["X"] = 60.64,
["Y"] = 70.15, ["Y"] = 70.15,
["CD"] = 0 ["CD"] = 0,
}, },
[13] = [13] = {
{
["X"] = 60.73, ["X"] = 60.73,
["Y"] = 70.37, ["Y"] = 70.37,
["CD"] = 0 ["CD"] = 0,
}, },
[14] = [14] = {
{
["X"] = 60.14, ["X"] = 60.14,
["Y"] = 70.54, ["Y"] = 70.54,
["CD"] = 0 ["CD"] = 0,
}, },
[15] = [15] = {
{
["X"] = 71.7, ["X"] = 71.7,
["Y"] = 70.48, ["Y"] = 70.48,
["CD"] = 0 ["CD"] = 0,
}, },
[16] = [16] = {
{
["X"] = 72.11, ["X"] = 72.11,
["Y"] = 71.16, ["Y"] = 71.16,
["CD"] = 0 ["CD"] = 0,
}, },
[17] = [17] = {
{
["X"] = 71.94, ["X"] = 71.94,
["Y"] = 70.56, ["Y"] = 70.56,
["CD"] = 0 ["CD"] = 0,
}, },
[18] = [18] = {
{
["X"] = 72.01, ["X"] = 72.01,
["Y"] = 70.35, ["Y"] = 70.35,
["CD"] = 0 ["CD"] = 0,
}, },
[19] = [19] = {
{
["X"] = 66.58, ["X"] = 66.58,
["Y"] = 69.36, ["Y"] = 69.36,
["CD"] = 0 ["CD"] = 0,
}, },
[20] = [20] = {
{
["X"] = 72.16, ["X"] = 72.16,
["Y"] = 70.51, ["Y"] = 70.51,
["CD"] = 0 ["CD"] = 0,
}, },
[21] = [21] = {
{
["X"] = 66.99, ["X"] = 66.99,
["Y"] = 68.62, ["Y"] = 68.62,
["CD"] = 0 ["CD"] = 0,
}, },
[22] = [22] = {
{
["X"] = 65.63, ["X"] = 65.63,
["Y"] = 69.87, ["Y"] = 69.87,
["CD"] = 0 ["CD"] = 0,
}, },
[23] = [23] = {
{
["X"] = 57.32, ["X"] = 57.32,
["Y"] = 76.15, ["Y"] = 76.15,
["CD"] = 0 ["CD"] = 0,
}, },
[24] = [24] = {
{
["X"] = 65.54, ["X"] = 65.54,
["Y"] = 69.99, ["Y"] = 69.99,
["CD"] = 0 ["CD"] = 0,
}, },
[25] = [25] = {
{
["X"] = 65.66, ["X"] = 65.66,
["Y"] = 69.51, ["Y"] = 69.51,
["CD"] = 0 ["CD"] = 0,
}, },
[26] = [26] = {
{
["X"] = 57.68, ["X"] = 57.68,
["Y"] = 72.53, ["Y"] = 72.53,
["CD"] = 0 ["CD"] = 0,
}, },
[27] = [27] = {
{
["X"] = 56.46, ["X"] = 56.46,
["Y"] = 73.39, ["Y"] = 73.39,
["CD"] = 0 ["CD"] = 0,
}, },
[28] = [28] = {
{
["X"] = 64.03, ["X"] = 64.03,
["Y"] = 73.84, ["Y"] = 73.84,
["CD"] = 0 ["CD"] = 0,
}, },
[29] = [29] = {
{
["X"] = 71.66, ["X"] = 71.66,
["Y"] = 70.86, ["Y"] = 70.86,
["CD"] = 0 ["CD"] = 0,
}, },
[30] = [30] = {
{
["X"] = 56.82, ["X"] = 56.82,
["Y"] = 75.45, ["Y"] = 75.45,
["CD"] = 0 ["CD"] = 0,
}, },
[31] = [31] = {
{
["X"] = 56.21, ["X"] = 56.21,
["Y"] = 76.01, ["Y"] = 76.01,
["CD"] = 0 ["CD"] = 0,
}, },
[32] = [32] = {
{
["X"] = 48.26, ["X"] = 48.26,
["Y"] = 79.27, ["Y"] = 79.27,
["CD"] = 0 ["CD"] = 0,
}, },
[33] = [33] = {
{
["X"] = 55.4, ["X"] = 55.4,
["Y"] = 73.17, ["Y"] = 73.17,
["CD"] = 0 ["CD"] = 0,
}, },
[34] = [34] = {
{
["X"] = 56.71, ["X"] = 56.71,
["Y"] = 78.07, ["Y"] = 78.07,
["CD"] = 0 ["CD"] = 0,
}, },
[35] = [35] = {
{
["X"] = 56.45, ["X"] = 56.45,
["Y"] = 76.92, ["Y"] = 76.92,
["CD"] = 0 ["CD"] = 0,
}, },
[36] = [36] = {
{
["X"] = 50.67, ["X"] = 50.67,
["Y"] = 80.17, ["Y"] = 80.17,
["CD"] = 0 ["CD"] = 0,
}, },
[37] = [37] = {
{
["X"] = 55.33, ["X"] = 55.33,
["Y"] = 76.05, ["Y"] = 76.05,
["CD"] = 0 ["CD"] = 0,
}, },
[38] = [38] = {
{
["X"] = 49.13, ["X"] = 49.13,
["Y"] = 78.84, ["Y"] = 78.84,
["CD"] = 0 ["CD"] = 0,
}, },
[39] = [39] = {
{
["X"] = 50.61, ["X"] = 50.61,
["Y"] = 78.54, ["Y"] = 78.54,
["CD"] = 0 ["CD"] = 0,
}, },
[40] = [40] = {
{
["X"] = 46.32, ["X"] = 46.32,
["Y"] = 78.96, ["Y"] = 78.96,
["CD"] = 0 ["CD"] = 0,
}, },
[41] = [41] = {
{
["X"] = 47.29, ["X"] = 47.29,
["Y"] = 79.19, ["Y"] = 79.19,
["CD"] = 0 ["CD"] = 0,
} },
} }
aura_env.cooldown = 91 aura_env.cooldown = 91
aura_env.wipeDistance = 15 aura_env.wipeDistance = 15
aura_env.angle = 0 aura_env.angle = 0
aura_env.hyp = 0 aura_env.hyp = 0
aura_env.GetClosestHerb = function() aura_env.GetClosestHerb = function()
aura_env.minID = aura_env.minID = {
{
["X"] = 0, ["X"] = 0,
["Y"] = 0, ["Y"] = 0,
["D"] = 1000, ["D"] = 1000,
["ID"] = 0 ["ID"] = 0,
} }
local pX = GetPlayerMapPosition("player") or 0 local pX = GetPlayerMapPosition("player") or 0
local pY = select(2, GetPlayerMapPosition("player")) or 0 local pY = select(2, GetPlayerMapPosition("player")) or 0

View File

@@ -37,9 +37,7 @@ aura_env.Colorer = {
---@type Color ---@type Color
local endColor = aura_env.Colorer.colors[bracket[2][1]] local endColor = aura_env.Colorer.colors[bracket[2][1]]
if startColor == nil or endColor == nil then if startColor == nil or endColor == nil then return color, "Color not found" end
return color, "Color not found"
end
local fraction = (value - bracket[1][2]) / (bracket[2][2] - bracket[1][2]) local fraction = (value - bracket[1][2]) / (bracket[2][2] - bracket[1][2])
@@ -54,9 +52,7 @@ aura_env.Colorer = {
---@param b number ---@param b number
---@param t number ---@param t number
---@return number ---@return number
lerp = function(a, b, t) lerp = function(a, b, t) return a * (1 - t) + b * t end,
return a * (1 - t) + b * t
end
} }
setmetatable(aura_env.Colorer, { __index = aura_env.Colorer }) setmetatable(aura_env.Colorer, { __index = aura_env.Colorer })
@@ -69,7 +65,7 @@ aura_env.ShieldBuffer = {
---@return ShieldBuffer ---@return ShieldBuffer
new = function(recordsToKeep) new = function(recordsToKeep)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = aura_env.ShieldBuffer __index = aura_env.ShieldBuffer,
}) })
self.recordsToKeep = recordsToKeep self.recordsToKeep = recordsToKeep
self.records = {} self.records = {}
@@ -92,9 +88,7 @@ aura_env.ShieldBuffer = {
GetMax = function(self) GetMax = function(self)
local max = 0 local max = 0
for _, value in pairs(self.records) do for _, value in pairs(self.records) do
if value > max then if value > max then max = value end
max = value
end
end end
if max == nil then return 0 end if max == nil then return 0 end
return max return max
@@ -105,7 +99,7 @@ aura_env.ShieldBuffer = {
local val = self.records[(self.pointer + self.recordsToKeep - 2) % self.recordsToKeep + 1] local val = self.records[(self.pointer + self.recordsToKeep - 2) % self.recordsToKeep + 1]
if val == nil then return 0 end if val == nil then return 0 end
return val return val
end end,
} }
---@class Shield ---@class Shield
@@ -117,7 +111,7 @@ aura_env.Shield = {
---@return Shield ---@return Shield
new = function(name) new = function(name)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = aura_env.Shield __index = aura_env.Shield,
}) })
self.name = name self.name = name
self.value = 0 self.value = 0
@@ -135,7 +129,7 @@ aura_env.Shield = {
self.value = 0 self.value = 0
end end
self.buffer:Append(self.value) self.buffer:Append(self.value)
end end,
} }
---@class ShieldManager ---@class ShieldManager
@@ -177,7 +171,7 @@ aura_env.ShieldManager = {
return string.format("%.1fM", current / 1e6), string.format("%.1fM", max / 1e6), current, max return string.format("%.1fM", current / 1e6), string.format("%.1fM", max / 1e6), current, max
end end
return string.format("%.0fk", current / 1000), string.format("%.0fk", max / 1000), current, max return string.format("%.0fk", current / 1000), string.format("%.0fk", max / 1000), current, max
end end,
} }
---@class Display ---@class Display
@@ -202,7 +196,7 @@ aura_env.Display = {
aura_env.Display.ofHp = string.format("%.0f%%", aura_env.Display.ofHpRaw) aura_env.Display.ofHp = string.format("%.0f%%", aura_env.Display.ofHpRaw)
aura_env.Display.color = aura_env.Colorer.Interpolate(aura_env.Display.ofHpRawFraction) aura_env.Display.color = aura_env.Colorer.Interpolate(aura_env.Display.ofHpRawFraction)
return nil return nil
end end,
} }
---@type table<Shield> ---@type table<Shield>

View File

@@ -1,15 +1,13 @@
---@param table table ---@param table table
---@param depth number? ---@param depth number?
function DumpTable(table, depth) function DumpTable(table, depth)
if depth == nil then if depth == nil then depth = 0 end
depth = 0 if depth > 200 then
end
if (depth > 200) then
print("Error: Depth > 200 in dumpTable()") print("Error: Depth > 200 in dumpTable()")
return return
end end
for k, v in pairs(table) do for k, v in pairs(table) do
if (type(v) == "table") then if type(v) == "table" then
print(string.rep(" ", depth) .. k .. ":") print(string.rep(" ", depth) .. k .. ":")
DumpTable(v, depth + 1) DumpTable(v, depth + 1)
else else
@@ -18,7 +16,6 @@ function DumpTable(table, depth)
end end
end end
local colorer = Colorer.new() local colorer = Colorer.new()
local value = 1.21 local value = 1.21

View File

@@ -10,9 +10,7 @@ if not WeakAurasSaved.Cyka then WeakAurasSaved.Cyka = {} end
if not WeakAurasSaved.Cyka.AchievementSniffer then WeakAurasSaved.Cyka.AchievementSniffer = {} end if not WeakAurasSaved.Cyka.AchievementSniffer then WeakAurasSaved.Cyka.AchievementSniffer = {} end
if not WeakAurasSaved.Cyka.AchievementSniffer2 then WeakAurasSaved.Cyka.AchievementSniffer2 = {} end if not WeakAurasSaved.Cyka.AchievementSniffer2 then WeakAurasSaved.Cyka.AchievementSniffer2 = {} end
for k, v in pairs(WeakAurasSaved.Cyka.AchievementSniffer2) do for k, v in pairs(WeakAurasSaved.Cyka.AchievementSniffer2) do
if WeakAurasSaved.Cyka.AchievementSniffer[k] then if WeakAurasSaved.Cyka.AchievementSniffer[k] then WeakAurasSaved.Cyka.AchievementSniffer[k] = nil end
WeakAurasSaved.Cyka.AchievementSniffer[k] = nil
end
end end
aura_env.achievements = { aura_env.achievements = {
@@ -196,9 +194,7 @@ aura_env.TryInspect = function()
if not should then return end if not should then return end
local canInspect = CheckInteractDistance("target", 1) local canInspect = CheckInteractDistance("target", 1)
if canInspect then if canInspect then SetAchievementComparisonUnit("target") end
SetAchievementComparisonUnit("target")
end
end end
---@param playerName string ---@param playerName string

View File

@@ -2,8 +2,6 @@ local year = 20
local month = 7 local month = 7
local day = 12 local day = 12
if year < 100 then if year < 100 then year = "20" .. year end
year = "20" .. year
end
print(string.format("%4d-%02d-%02d", year, month, day)) print(string.format("%4d-%02d-%02d", year, month, day))

View File

@@ -2,5 +2,5 @@ aura_env.KickTime = 0
aura_env.AfkSince = 0 aura_env.AfkSince = 0
WeakAurasSaved.Cyka.LoginInfo = { WeakAurasSaved.Cyka.LoginInfo = {
[Today] = WeakAurasSaved.Cyka.LoginInfo[Today] or {} [Today] = WeakAurasSaved.Cyka.LoginInfo[Today] or {},
} }

View File

@@ -12,9 +12,7 @@ GetItemInfo = function(msg)
itemInfo.name = name itemInfo.name = name
itemInfo.quantity = quantity itemInfo.quantity = quantity
if WeakAurasSaved.Cyka.ItemCache[name] then if WeakAurasSaved.Cyka.ItemCache[name] then itemInfo.icon = WeakAurasSaved.Cyka.ItemCache[name].icon end
itemInfo.icon = WeakAurasSaved.Cyka.ItemCache[name].icon
end
local color = msg:match("cff(%w%w%w%w%w%w)") or "ffffff" local color = msg:match("cff(%w%w%w%w%w%w)") or "ffffff"
itemInfo.color = color itemInfo.color = color

View File

@@ -129,7 +129,7 @@ Filter = {
---@return Filter ---@return Filter
new = function(requires, filter) new = function(requires, filter)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = Filter __index = Filter,
}) })
self.requires = requires self.requires = requires
self.filter = filter self.filter = filter
@@ -157,24 +157,24 @@ Filter = {
if debug then print(err) end if debug then print(err) end
end end
return res, nil return res, nil
end end,
} }
local goldFilter = Filter.new({ ["name"] = getItemName }, local goldFilter = Filter.new({ ["name"] = getItemName }, function(slot, provided)
function(slot, provided)
---@cast provided { name: string } ---@cast provided { name: string }
if not aura_env.config.goldFilter then return false end if not aura_env.config.goldFilter then return false end
if string.find(provided.name, "Gold") or if
string.find(provided.name, "Silver") or string.find(provided.name, "Gold")
string.find(provided.name, "Copper") then or string.find(provided.name, "Silver")
or string.find(provided.name, "Copper")
then
if debug then print(string.format("Gold filter pass for %s", provided.name)) end if debug then print(string.format("Gold filter pass for %s", provided.name)) end
return true return true
end end
if debug then print(string.format("Gold filter fail for %s", provided.name)) end if debug then print(string.format("Gold filter fail for %s", provided.name)) end
return false return false
end) end)
local orderResourcesFilter = Filter.new({ ["name"] = getItemName }, local orderResourcesFilter = Filter.new({ ["name"] = getItemName }, function(slot, provided)
function(slot, provided)
---@cast provided { name: string } ---@cast provided { name: string }
if not aura_env.config.orderResourcesFilter then return false end if not aura_env.config.orderResourcesFilter then return false end
if string.find(provided.name, "Order Resources") then if string.find(provided.name, "Order Resources") then
@@ -184,8 +184,7 @@ local orderResourcesFilter = Filter.new({ ["name"] = getItemName },
if debug then print(string.format("Order resource filter fail for %s", provided.name)) end if debug then print(string.format("Order resource filter fail for %s", provided.name)) end
return false return false
end) end)
local mountFilter = Filter.new({ ["type"] = getItemType }, local mountFilter = Filter.new({ ["type"] = getItemType }, function(slot, provided)
function(slot, provided)
---@cast provided { type: string } ---@cast provided { type: string }
if not aura_env.config.mountFilter then return false end if not aura_env.config.mountFilter then return false end
if provided.type == "Mount" then if provided.type == "Mount" then
@@ -195,8 +194,7 @@ local mountFilter = Filter.new({ ["type"] = getItemType },
if debug then print(string.format("Mount filter fail for type %s", provided.type)) end if debug then print(string.format("Mount filter fail for type %s", provided.type)) end
return false return false
end) end)
local ilvlFilter = Filter.new({ ["ilvl"] = getItemLevel }, local ilvlFilter = Filter.new({ ["ilvl"] = getItemLevel }, function(slot, provided)
function(slot, provided)
---@cast provided { ilvl: number } ---@cast provided { ilvl: number }
if not aura_env.config.ilvlFilter then return false end if not aura_env.config.ilvlFilter then return false end
if provided.ilvl and provided.ilvl > aura_env.config.ilvlFilterThreshold then if provided.ilvl and provided.ilvl > aura_env.config.ilvlFilterThreshold then
@@ -208,9 +206,8 @@ local ilvlFilter = Filter.new({ ["ilvl"] = getItemLevel },
end) end)
local professionFilter = Filter.new({ local professionFilter = Filter.new({
["type"] = getItemType, ["type"] = getItemType,
["subtype"] = getItemSubtype ["subtype"] = getItemSubtype,
}, }, function(slot, provided)
function(slot, provided)
---@cast provided { type: string, subtype: string } ---@cast provided { type: string, subtype: string }
if not aura_env.config.professionFilter then return false end if not aura_env.config.professionFilter then return false end
@@ -238,9 +235,8 @@ local professionFilter = Filter.new({
end) end)
local valueFilter = Filter.new({ local valueFilter = Filter.new({
["value"] = getItemValue, ["value"] = getItemValue,
["quantity"] = getItemQuality ["quantity"] = getItemQuality,
}, }, function(slot, provided)
function(slot, provided)
---@cast provided { value: number, quantity: number } ---@cast provided { value: number, quantity: number }
if not aura_env.config.valueFilter then return false end if not aura_env.config.valueFilter then return false end
@@ -259,9 +255,8 @@ local valueFilter = Filter.new({
local greyValueFilter = Filter.new({ local greyValueFilter = Filter.new({
["quality"] = getItemQuality, ["quality"] = getItemQuality,
["value"] = getItemValue, ["value"] = getItemValue,
["quantity"] = getItemQuantity ["quantity"] = getItemQuantity,
}, }, function(slot, provided)
function(slot, provided)
---@cast provided { quality: number, value: number, quantity: number } ---@cast provided { quality: number, value: number, quantity: number }
if not aura_env.config.greyValueFilter then return false end if not aura_env.config.greyValueFilter then return false end
@@ -273,36 +268,33 @@ local greyValueFilter = Filter.new({
if value > valueThreshold then if value > valueThreshold then
if debug then if debug then
print(string.format("Grey value filter pass for value %d of %s quality items", value, print(string.format("Grey value filter pass for value %d of %s quality items", value, provided.quality))
provided.quality))
end end
return true return true
end end
end end
if debug then if debug then
print(string.format("Grey value filter fail for value %d of %s quality items", provided.value, print(
provided.quality)) string.format("Grey value filter fail for value %d of %s quality items", provided.value, provided.quality)
)
end end
return false return false
end) end)
local questItemFilter = Filter.new({ local questItemFilter = Filter.new({
["type"] = getItemType, ["type"] = getItemType,
["subtype"] = getItemSubtype ["subtype"] = getItemSubtype,
}, }, function(slot, provided)
function(slot, provided)
---@cast provided { type: string, subtype: string } ---@cast provided { type: string, subtype: string }
if not aura_env.config.questItemsFilter then return false end if not aura_env.config.questItemsFilter then return false end
if provided.type == "Quest" and provided.subtype == "Quest" then if provided.type == "Quest" and provided.subtype == "Quest" then
if debug then if debug then
print(string.format("Quest item filter pass for type %s and subtype", provided.type, print(string.format("Quest item filter pass for type %s and subtype", provided.type, provided.subtype))
provided.subtype))
end end
return true return true
end end
if debug then if debug then
print(string.format("Quest item filter fail for type %s and subtype", provided.type, print(string.format("Quest item filter fail for type %s and subtype", provided.type, provided.subtype))
provided.subtype))
end end
return false return false
end) end)
@@ -311,9 +303,8 @@ local classGearFilter = Filter.new({
["quality"] = getItemQuality, ["quality"] = getItemQuality,
["type"] = getItemType, ["type"] = getItemType,
["subtype"] = getItemSubtype, ["subtype"] = getItemSubtype,
["equiploc"] = getItemEquipLocation ["equiploc"] = getItemEquipLocation,
}, }, function(slot, provided)
function(slot, provided)
---@cast provided { ilvl: number, quality: number, type: string, subtype: string, equiploc: string } ---@cast provided { ilvl: number, quality: number, type: string, subtype: string, equiploc: string }
if not aura_env.config.classGearFilter then return false end if not aura_env.config.classGearFilter then return false end
@@ -324,19 +315,16 @@ local classGearFilter = Filter.new({
if isEquippable and provided.ilvl > ilvlThreshold and provided.quality > qualityThreshold then if isEquippable and provided.ilvl > ilvlThreshold and provided.quality > qualityThreshold then
if debug then if debug then
print(string.format("Class gear filter pass for ilvl %d and quality %d", provided.ilvl, print(string.format("Class gear filter pass for ilvl %d and quality %d", provided.ilvl, provided.quality))
provided.quality))
end end
return true return true
end end
if debug then if debug then
print(string.format("Class gear filter fail for ilvl %d and quality %d", provided.ilvl, print(string.format("Class gear filter fail for ilvl %d and quality %d", provided.ilvl, provided.quality))
provided.quality))
end end
return false return false
end) end)
local nameFilter = Filter.new({ ["name"] = getItemName }, local nameFilter = Filter.new({ ["name"] = getItemName }, function(slot, provided)
function(slot, provided)
---@cast provided { name: string } ---@cast provided { name: string }
if not aura_env.config.nameFilter then return false end if not aura_env.config.nameFilter then return false end
@@ -358,8 +346,7 @@ local nameFilter = Filter.new({ ["name"] = getItemName },
if debug then print(string.format("Name filter fail for %s", provided.name)) end if debug then print(string.format("Name filter fail for %s", provided.name)) end
return false return false
end) end)
local reicpeFilter = Filter.new({ ["name"] = getItemName }, local reicpeFilter = Filter.new({ ["name"] = getItemName }, function(slot, provided)
function(slot, provided)
---@cast provided { name: string } ---@cast provided { name: string }
if string.find(provided.name, "Recipe") or string.find(provided.name, "Technique") then if string.find(provided.name, "Recipe") or string.find(provided.name, "Technique") then
if debug then print(string.format("Recipe filter pass for %s", provided.name)) end if debug then print(string.format("Recipe filter pass for %s", provided.name)) end
@@ -373,9 +360,8 @@ local boeFilter = Filter.new({
["type"] = getItemType, ["type"] = getItemType,
["quality"] = getItemQuality, ["quality"] = getItemQuality,
["equiploc"] = getItemEquipLocation, ["equiploc"] = getItemEquipLocation,
["bindtype"] = getBindType ["bindtype"] = getBindType,
}, }, function(slot, provided)
function(slot, provided)
---@cast provided { ilvl: number, type: string, quality: number, equiploc: string, bindtype: number } ---@cast provided { ilvl: number, type: string, quality: number, equiploc: string, bindtype: number }
aura_env.config.boeFilter = true aura_env.config.boeFilter = true
@@ -384,12 +370,14 @@ local boeFilter = Filter.new({
local itemType = provided.type local itemType = provided.type
local itemEquipLoc = provided.equiploc local itemEquipLoc = provided.equiploc
if (itemType == "Armor" if
itemType == "Armor"
or itemType == "Weapon" or itemType == "Weapon"
or itemEquipLoc == "INVTYPE_FINGER" or itemEquipLoc == "INVTYPE_FINGER"
or itemEquipLoc == "INVTYPE_TRINKET" or itemEquipLoc == "INVTYPE_TRINKET"
or itemEquipLoc == "INVTYPE_CLOAK" or itemEquipLoc == "INVTYPE_CLOAK"
or itemEquipLoc == "INVTYPE_NECK") then or itemEquipLoc == "INVTYPE_NECK"
then
local itemLevel = provided.ilvl local itemLevel = provided.ilvl
local itemQuality = provided.quality local itemQuality = provided.quality
local bindType = provided.bindtype local bindType = provided.bindtype
@@ -399,33 +387,53 @@ local boeFilter = Filter.new({
return true return true
end end
end end
if debug then print(string.format("BoE filter fail for ilvl %d and quality %d", provided.ilvl, provided.quality)) end if debug then
print(string.format("BoE filter fail for ilvl %d and quality %d", provided.ilvl, provided.quality))
end
return false return false
end) end)
local artifactPowerFilter = Filter.new({ local artifactPowerFilter = Filter.new({
["type"] = getItemType, ["type"] = getItemType,
["subtype"] = getItemSubtype, ["subtype"] = getItemSubtype,
["subclassid"] = getItemSubclassId, ["subclassid"] = getItemSubclassId,
["value"] = getItemValue ["value"] = getItemValue,
}, function(slot, provided) }, function(slot, provided)
---@cast provided { type: string, subtype: string, subclassid: number, value: number } ---@cast provided { type: string, subtype: string, subclassid: number, value: number }
if not aura_env.config.artifactPowerFilter then return false end if not aura_env.config.artifactPowerFilter then return false end
if provided.value == 0 and provided.type == "Consumable" and provided.subtype == "Other" and provided.subclassid == 8 then if
provided.value == 0
and provided.type == "Consumable"
and provided.subtype == "Other"
and provided.subclassid == 8
then
if debug then if debug then
print(string.format("Artifact power filter pass for type %s and subtype %s and subclassid %d with value %d", print(
provided.type, provided.subtype, provided.subclassid, provided.value)) string.format(
"Artifact power filter pass for type %s and subtype %s and subclassid %d with value %d",
provided.type,
provided.subtype,
provided.subclassid,
provided.value
)
)
end end
return true return true
end end
if debug then if debug then
DevTools_Dump(provided) DevTools_Dump(provided)
print(string.format("Artifact power filter fail for type %s and subtype %s and subclassid %d with value %d", print(
provided.type, provided.subtype, provided.subclassid, provided.value)) string.format(
"Artifact power filter fail for type %s and subtype %s and subclassid %d with value %d",
provided.type,
provided.subtype,
provided.subclassid,
provided.value
)
)
end end
return false return false
end) end)
local everythingFilter = Filter.new({ ["name"] = getItemName }, local everythingFilter = Filter.new({ ["name"] = getItemName }, function(slot, provided)
function(slot, provided)
---@cast provided { name: string } ---@cast provided { name: string }
return aura_env.config.everythingFilter return aura_env.config.everythingFilter
end) end)
@@ -492,9 +500,11 @@ aura_env.FilterService = {
itemName = itemName:gsub("\n", ", ") itemName = itemName:gsub("\n", ", ")
local itemQuality = getItemQuality(slot) or 0 local itemQuality = getItemQuality(slot) or 0
if string.find(itemName, "Gold") == nil if
string.find(itemName, "Gold") == nil
and string.find(itemName, "Silver") == nil and string.find(itemName, "Silver") == nil
and string.find(itemName, "Copper") == nil then and string.find(itemName, "Copper") == nil
then
if not WeakAurasSaved.Cyka.ItemCache[itemName] then if not WeakAurasSaved.Cyka.ItemCache[itemName] then
WeakAurasSaved.Cyka.ItemCache[itemName] = { WeakAurasSaved.Cyka.ItemCache[itemName] = {
icon = itemIcon, icon = itemIcon,
@@ -502,7 +512,7 @@ aura_env.FilterService = {
} }
end end
end end
end end,
} }
aura_env.skills = { aura_env.skills = {

View File

@@ -18,10 +18,7 @@ local function getItemQuantity(container, slot)
if container == nil then return "", string.format("Container is nil") end if container == nil then return "", string.format("Container is nil") end
if slot == nil then return "", string.format("Slot is nil") end if slot == nil then return "", string.format("Slot is nil") end
local quantity = select(2, GetContainerItemInfo(container, slot)) local quantity = select(2, GetContainerItemInfo(container, slot))
if quantity == nil then if quantity == nil then return "", string.format("GetContainerItemInfo returned nil for quantity (arg 2)") end
return "",
string.format("GetContainerItemInfo returned nil for quantity (arg 2)")
end
return quantity return quantity
end end
---@param container number ---@param container number
@@ -124,7 +121,7 @@ Filter = {
---@return Filter ---@return Filter
new = function(requires, filter) new = function(requires, filter)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = Filter __index = Filter,
}) })
self.requires = requires self.requires = requires
self.filter = filter self.filter = filter
@@ -153,39 +150,35 @@ Filter = {
if debug then print(err) end if debug then print(err) end
end end
return res, nil return res, nil
end end,
} }
local grayFilter = Filter.new({ local grayFilter = Filter.new({
["quality"] = getItemQuality ["quality"] = getItemQuality,
}, }, function(container, slot, provided)
function(container, slot, provided)
if not aura_env.config.grayFilter then return false end if not aura_env.config.grayFilter then return false end
if provided.quality == 0 then if provided.quality == 0 then return true end
return true
end
return false return false
end) end)
local gearFilter = Filter.new({ local gearFilter = Filter.new({
["ilvl"] = getItemLevel, ["ilvl"] = getItemLevel,
["bindType"] = getBindType, ["bindType"] = getBindType,
["type"] = getItemType, ["type"] = getItemType,
["equipLoc"] = getItemEquipLocation ["equipLoc"] = getItemEquipLocation,
}, }, function(container, slot, provided)
function(container, slot, provided)
if not aura_env.config.gearFilter then return false end if not aura_env.config.gearFilter then return false end
local ilvlThreshold = aura_env.config.gearFilterIlvlFilterThreshold local ilvlThreshold = aura_env.config.gearFilterIlvlFilterThreshold
local sellBoe = aura_env.config.gearFilterSellBoe local sellBoe = aura_env.config.gearFilterSellBoe
if provided.type == "Armor" if
provided.type == "Armor"
or provided.type == "Weapon" or provided.type == "Weapon"
or provided.equipLoc == "INVTYPE_FINGER" or provided.equipLoc == "INVTYPE_FINGER"
or provided.equipLoc == "INVTYPE_TRINKET" or provided.equipLoc == "INVTYPE_TRINKET"
or provided.equipLoc == "INVTYPE_CLOAK" or provided.equipLoc == "INVTYPE_CLOAK"
or provided.equipLoc == "INVTYPE_NECK" then or provided.equipLoc == "INVTYPE_NECK"
if provided.ilvl < ilvlThreshold and (provided.bindType == 1 or sellBoe) then then
return true if provided.ilvl < ilvlThreshold and (provided.bindType == 1 or sellBoe) then return true end
end
end end
return false return false
end) end)
@@ -229,7 +222,7 @@ end
---@type table<Filter> ---@type table<Filter>
local filters = { local filters = {
grayFilter, grayFilter,
gearFilter gearFilter,
} }
---@class FilterService ---@class FilterService

View File

@@ -57,7 +57,7 @@ end
---@field currentDayOnlineTimeMilliseconds number ---@field currentDayOnlineTimeMilliseconds number
BattlepassInfo = { BattlepassInfo = {
PingApi = function() PingApi = function()
SendAddonMessage('UIMSG_TO_SERVER', "UIMSG_GET_ONLINETIME_DAY" .. "\t", 'WHISPER', UnitName('player')) SendAddonMessage("UIMSG_TO_SERVER", "UIMSG_GET_ONLINETIME_DAY" .. "\t", "WHISPER", UnitName("player"))
end, end,
ParseApi = function(msg) ParseApi = function(msg)
local packets = aura_env.Split(msg, ":") local packets = aura_env.Split(msg, ":")
@@ -71,24 +71,22 @@ BattlepassInfo = {
BattlepassInfo.cost = tonumber(packets[7]) BattlepassInfo.cost = tonumber(packets[7])
BattlepassInfo.currentDayOnlineTimeMinutes = math.floor(BattlepassInfo.currentDayOnlineTimeMilliseconds / 60000) BattlepassInfo.currentDayOnlineTimeMinutes = math.floor(BattlepassInfo.currentDayOnlineTimeMilliseconds / 60000)
WeakAurasSaved.Cyka.LoginInfo[Today][UnitName("player")].onlineTimeInMinutes = BattlepassInfo WeakAurasSaved.Cyka.LoginInfo[Today][UnitName("player")].onlineTimeInMinutes =
.currentDayOnlineTimeMinutes BattlepassInfo.currentDayOnlineTimeMinutes
WeakAurasSaved.Cyka.LoginInfo[Today][UnitName("player")].claimed = BattlepassInfo.dayRewardComplete WeakAurasSaved.Cyka.LoginInfo[Today][UnitName("player")].claimed = BattlepassInfo.dayRewardComplete
if BattlepassInfo.dayRewardComplete == 0 and BattlepassInfo.currentDayOnlineTimeMinutes >= 120 then if BattlepassInfo.dayRewardComplete == 0 and BattlepassInfo.currentDayOnlineTimeMinutes >= 120 then
BattlepassInfo.DoClaim() BattlepassInfo.DoClaim()
C_Timer.After(0.2, function() C_Timer.After(0.2, function() BattlepassInfo.PingApi() end)
BattlepassInfo.PingApi()
end)
end end
UpdateAccountInfo() UpdateAccountInfo()
end, end,
DoClaim = function() DoClaim = function()
SendAddonMessage('UIMSG_TO_SERVER', "UIMSG_WEEKLY_REW_GET" .. "\t", 'WHISPER', UnitName('player')) SendAddonMessage("UIMSG_TO_SERVER", "UIMSG_WEEKLY_REW_GET" .. "\t", "WHISPER", UnitName("player"))
WeakAuras.ScanEvents("PLAY_SOUND", "Interface\\Sounds\\quack.ogg") WeakAuras.ScanEvents("PLAY_SOUND", "Interface\\Sounds\\quack.ogg")
SendChatMessage("YEEE", "WHISPER", nil, UnitName("player")) SendChatMessage("YEEE", "WHISPER", nil, UnitName("player"))
end end,
} }
setmetatable(BattlepassInfo, { setmetatable(BattlepassInfo, {
__call = BattlepassInfo.PingApi, __call = BattlepassInfo.PingApi,
@@ -99,16 +97,13 @@ setmetatable(BattlepassInfo, {
table.insert(ret, k .. ": " .. tostring(v)) table.insert(ret, k .. ": " .. tostring(v))
end end
return table.concat(ret, "\n") return table.concat(ret, "\n")
end end,
}) })
for k, v in pairs(BattlepassInfo) do for k, v in pairs(BattlepassInfo) do
if type(v) == "number" then if type(v) == "number" then BattlepassInfo[k] = 0 end
BattlepassInfo[k] = 0
end
end end
BattlepassInfo() BattlepassInfo()
-- Claiming rewards works fine -- Claiming rewards works fine
-- But the bar does not hide once rewards are claimed -- But the bar does not hide once rewards are claimed

View File

@@ -2,7 +2,7 @@ local function varargToString(...)
local output = {} local output = {}
for i = 1, select("#", ...) do for i = 1, select("#", ...) do
local value = select(i, ...) local value = select(i, ...)
output[#output + 1] = "\"" .. tostring(value) .. "\"" output[#output + 1] = '"' .. tostring(value) .. '"'
end end
return table.concat(output, ",") return table.concat(output, ",")
end end

View File

@@ -52,9 +52,7 @@ aura_env.JoinChannels = function()
for i, channelName in ipairs(channelNames) do for i, channelName in ipairs(channelNames) do
channelName = strtrim(channelName) channelName = strtrim(channelName)
local password = nil local password = nil
if i <= #channelPasswords then if i <= #channelPasswords then password = strtrim(channelPasswords[i]) end
password = strtrim(channelPasswords[i])
end
JoinPermanentChannel(channelName, password) JoinPermanentChannel(channelName, password)
end end
end end

View File

@@ -49,9 +49,7 @@ aura_env.Colorer = {
---@param b number ---@param b number
---@param t number ---@param t number
---@return number ---@return number
lerp = function(a, b, t) lerp = function(a, b, t) return a * (1 - t) + b * t end,
return a * (1 - t) + b * t
end
} }
setmetatable(aura_env.Colorer, { __index = aura_env.Colorer }) setmetatable(aura_env.Colorer, { __index = aura_env.Colorer })
@@ -70,5 +68,5 @@ aura_env.KeystoneIdMap = {
[227] = "Return to Karazhan: Lower", [227] = "Return to Karazhan: Lower",
[233] = "Cathedral of Eternal Night", [233] = "Cathedral of Eternal Night",
[234] = "Return to Karazhan: Upper", [234] = "Return to Karazhan: Upper",
[239] = "Seat of the Triumvirate" [239] = "Seat of the Triumvirate",
} }

File diff suppressed because one or more lines are too long

1
FreshShit/Incoming/sct Normal file

File diff suppressed because one or more lines are too long

View File

@@ -14,7 +14,7 @@ aura_env.BaseCooldown = {
---@return BaseCooldown ---@return BaseCooldown
new = function(id, name, playbackSpeed) new = function(id, name, playbackSpeed)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = aura_env.BaseCooldown __index = aura_env.BaseCooldown,
}) })
self.id = id self.id = id
self.name = name self.name = name
@@ -58,8 +58,7 @@ aura_env.BaseCooldown = {
playComplete = function(self) playComplete = function(self)
local soundFile = string.format("Interface\\Sounds\\alerts\\%s.ogg", self.filename) local soundFile = string.format("Interface\\Sounds\\alerts\\%s.ogg", self.filename)
if aura_env.debug then if aura_env.debug then
print(string.format("%s is off cooldown, playing sound file at %s", self.filename, print(string.format("%s is off cooldown, playing sound file at %s", self.filename, soundFile))
soundFile))
end end
WeakAuras.ScanEvents("PLAY_SOUND", soundFile) WeakAuras.ScanEvents("PLAY_SOUND", soundFile)
end, end,
@@ -68,11 +67,10 @@ aura_env.BaseCooldown = {
playSoon = function(self) playSoon = function(self)
local soundFile = string.format("Interface\\Sounds\\alerts\\%s_soon.ogg", self.filename) local soundFile = string.format("Interface\\Sounds\\alerts\\%s_soon.ogg", self.filename)
if aura_env.debug then if aura_env.debug then
print(string.format("%s is almost off cooldown, playing sound file at %s", self.filename, print(string.format("%s is almost off cooldown, playing sound file at %s", self.filename, soundFile))
soundFile))
end end
WeakAuras.ScanEvents("PLAY_SOUND", soundFile) WeakAuras.ScanEvents("PLAY_SOUND", soundFile)
end end,
} }
---@class Spell:BaseCooldown ---@class Spell:BaseCooldown
@@ -85,15 +83,13 @@ aura_env.Spell = {
local obj = aura_env.BaseCooldown.new(id, name, playbackSpeed) local obj = aura_env.BaseCooldown.new(id, name, playbackSpeed)
---@cast obj Spell ---@cast obj Spell
setmetatable(obj, { setmetatable(obj, {
__index = aura_env.Spell __index = aura_env.Spell,
}) })
return obj return obj
end, end,
Update = function(self) Update = function(self) aura_env.BaseCooldown.Update(self, GetSpellCooldown) end,
aura_env.BaseCooldown.Update(self, GetSpellCooldown)
end,
playComplete = aura_env.BaseCooldown.playComplete, playComplete = aura_env.BaseCooldown.playComplete,
playSoon = aura_env.BaseCooldown.playSoon playSoon = aura_env.BaseCooldown.playSoon,
} }
---@class Item:BaseCooldown ---@class Item:BaseCooldown
aura_env.Item = { aura_env.Item = {
@@ -105,15 +101,13 @@ aura_env.Item = {
local obj = aura_env.BaseCooldown.new(id, name, playbackSpeed) local obj = aura_env.BaseCooldown.new(id, name, playbackSpeed)
---@cast obj Item ---@cast obj Item
setmetatable(obj, { setmetatable(obj, {
__index = aura_env.Item __index = aura_env.Item,
}) })
return obj return obj
end, end,
Update = function(self) Update = function(self) aura_env.BaseCooldown.Update(self, GetItemCooldown) end,
aura_env.BaseCooldown.Update(self, GetItemCooldown)
end,
playComplete = aura_env.BaseCooldown.playComplete, playComplete = aura_env.BaseCooldown.playComplete,
playSoon = aura_env.BaseCooldown.playSoon playSoon = aura_env.BaseCooldown.playSoon,
} }
---@class Buff:BaseCooldown ---@class Buff:BaseCooldown
---@field isActive boolean ---@field isActive boolean
@@ -126,7 +120,7 @@ aura_env.Buff = {
local obj = aura_env.BaseCooldown.new(id, name, playbackSpeed) local obj = aura_env.BaseCooldown.new(id, name, playbackSpeed)
---@cast obj Buff ---@cast obj Buff
setmetatable(obj, { setmetatable(obj, {
__index = aura_env.Buff __index = aura_env.Buff,
}) })
obj.isActive = false obj.isActive = false
return obj return obj
@@ -156,15 +150,19 @@ aura_env.Buff = {
---@param self Buff ---@param self Buff
playComplete = function(self) playComplete = function(self)
local soundFile = string.format("Interface\\Sounds\\alerts\\%s_expired.ogg", self.filename) local soundFile = string.format("Interface\\Sounds\\alerts\\%s_expired.ogg", self.filename)
if aura_env.debug then print(string.format("%s expired, playing sound file at %s", self.filename, soundFile)) end if aura_env.debug then
print(string.format("%s expired, playing sound file at %s", self.filename, soundFile))
end
WeakAuras.ScanEvents("PLAY_SOUND", soundFile) WeakAuras.ScanEvents("PLAY_SOUND", soundFile)
end, end,
---@param self Buff ---@param self Buff
playSoon = function(self) playSoon = function(self)
local soundFile = string.format("Interface\\Sounds\\alerts\\%s_expiring.ogg", self.filename) local soundFile = string.format("Interface\\Sounds\\alerts\\%s_expiring.ogg", self.filename)
if aura_env.debug then print(string.format("%s expiring, playing sound file at %s", self.filename, soundFile)) end if aura_env.debug then
WeakAuras.ScanEvents("PLAY_SOUND", soundFile) print(string.format("%s expiring, playing sound file at %s", self.filename, soundFile))
end end
WeakAuras.ScanEvents("PLAY_SOUND", soundFile)
end,
} }
---@type table<BaseCooldown>|nil ---@type table<BaseCooldown>|nil
@@ -185,5 +183,5 @@ aura_env.Cooldowns = {
aura_env.Spell.new(196098, "Soul Harvest", 1.6), aura_env.Spell.new(196098, "Soul Harvest", 1.6),
aura_env.Item.new(5512, "Healthstone", 1.6), aura_env.Item.new(5512, "Healthstone", 1.6),
aura_env.Buff.new(0, "Deadwind Harvester", 1.6), aura_env.Buff.new(0, "Deadwind Harvester", 1.6),
} },
} }

View File

@@ -56,9 +56,7 @@ aura_env.ScoreColorer = {
---@param b number ---@param b number
---@param t number ---@param t number
---@return number ---@return number
lerp = function(a, b, t) lerp = function(a, b, t) return a * (1 - t) + b * t end,
return a * (1 - t) + b * t
end
} }
---@class KeyLevel ---@class KeyLevel
---@field colors table<number, Color> ---@field colors table<number, Color>
@@ -111,9 +109,7 @@ aura_env.KeyLevel = {
---@param b number ---@param b number
---@param t number ---@param t number
---@return number ---@return number
lerp = function(a, b, t) lerp = function(a, b, t) return a * (1 - t) + b * t end,
return a * (1 - t) + b * t
end
} }
---@class Key ---@class Key
@@ -138,18 +134,27 @@ Key = {
local formattedScore, err = aura_env.ScoreColorer.Interpolate(self.score) local formattedScore, err = aura_env.ScoreColorer.Interpolate(self.score)
if not err then if not err then
score = string.format("|cff%02x%02x%02x%d|r", formattedScore.r * 255, formattedScore.g * 255, score = string.format(
formattedScore.b * 255, self.score) "|cff%02x%02x%02x%d|r",
formattedScore.r * 255,
formattedScore.g * 255,
formattedScore.b * 255,
self.score
)
end end
local formattedLevel, err = aura_env.KeyLevel.Interpolate(keyLevel) local formattedLevel, err = aura_env.KeyLevel.Interpolate(keyLevel)
if not err then if not err then
level = string.format("|cff%02x%02x%02x%s|r", formattedLevel.r * 255, formattedLevel.g * 255, level = string.format(
formattedLevel.b * 255, self.level) "|cff%02x%02x%02x%s|r",
formattedLevel.r * 255,
formattedLevel.g * 255,
formattedLevel.b * 255,
self.level
)
end end
return string.format("%-30s %-10s %-10s %-10s %-10s", self.name, self.role, level, self.time, return string.format("%-30s %-10s %-10s %-10s %-10s", self.name, self.role, level, self.time, score)
score)
end, end,
}) })
self.name = name self.name = name
@@ -160,9 +165,7 @@ Key = {
return self return self
end, end,
---@return string ---@return string
hash = function(self) hash = function(self) return table.concat({ self.name, self.role, self.level, self.time, self.score }, "/") end,
return table.concat({ self.name, self.role, self.level, self.time, self.score }, "/")
end,
---@param self Key ---@param self Key
---@param other Key ---@param other Key
@@ -170,9 +173,7 @@ Key = {
compareTo = function(self, other) compareTo = function(self, other)
if not self then return true end if not self then return true end
if not other then return false end if not other then return false end
if self.name <= other.name then if self.name <= other.name then return true end
return true
end
return false return false
end, end,
---@param self Key ---@param self Key
@@ -180,7 +181,7 @@ Key = {
if not WeakAurasSaved.Cyka then WeakAurasSaved.Cyka = {} end if not WeakAurasSaved.Cyka then WeakAurasSaved.Cyka = {} end
if not WeakAurasSaved.Cyka.MData then WeakAurasSaved.Cyka.MData = {} end if not WeakAurasSaved.Cyka.MData then WeakAurasSaved.Cyka.MData = {} end
WeakAurasSaved.Cyka.MData[self:hash()] = self WeakAurasSaved.Cyka.MData[self:hash()] = self
end end,
} }
---@param keys Key[] ---@param keys Key[]
@@ -207,9 +208,7 @@ function aura_env.Process()
local keyObj = Key.new(key, role, level, time, score) local keyObj = Key.new(key, role, level, time, score)
keyObj:register() keyObj:register()
if key then if key then keys[#keys + 1] = keyObj end
keys[#keys + 1] = keyObj
end
end end
table.sort(keys, Key.compareTo) table.sort(keys, Key.compareTo)
render(keys) render(keys)

View File

@@ -147,7 +147,7 @@ local function GetCastInfoForGuid(guid)
name = "", name = "",
startms = 0, startms = 0,
endms = 0, endms = 0,
spellid = 0 spellid = 0,
} }
local unit, err = GetUnitFromGuid(guid) local unit, err = GetUnitFromGuid(guid)
@@ -179,7 +179,7 @@ aura_env.Alert = {
---@return Alert ---@return Alert
new = function(id, name, events, instruction, afflictedInstruction) new = function(id, name, events, instruction, afflictedInstruction)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = aura_env.Alert __index = aura_env.Alert,
}) })
self.id = id self.id = id
name = string.gsub(name, " ", "_") name = string.gsub(name, " ", "_")
@@ -234,9 +234,7 @@ aura_env.Alert = {
end end
local displayText = self.instruction local displayText = self.instruction
if err == nil and targetInfo.target == PlayerName then if err == nil and targetInfo.target == PlayerName then displayText = self.afflictedInstruction end
displayText = self.afflictedInstruction
end
local castEnd = math.max(GetTime() + 5, castInfo.endms / 1000) local castEnd = math.max(GetTime() + 5, castInfo.endms / 1000)
local castDuration = math.max(5, (castInfo.endms - castInfo.startms) / 1000) local castDuration = math.max(5, (castInfo.endms - castInfo.startms) / 1000)
@@ -259,7 +257,7 @@ aura_env.Alert = {
allstates[string.format("%d-%d", self.id, self.iterator)] = state allstates[string.format("%d-%d", self.id, self.iterator)] = state
self.iterator = self.iterator + 1 self.iterator = self.iterator + 1
return nil return nil
end end,
} }
local alerts = { local alerts = {
@@ -274,7 +272,13 @@ local alerts = {
-- Felhounds -- Felhounds
aura_env.Alert.new(244086, "Molten Touch", { "SPELL_CAST_SUCCESS" }, "", "Run away"), aura_env.Alert.new(244086, "Molten Touch", { "SPELL_CAST_SUCCESS" }, "", "Run away"),
aura_env.Alert.new(244768, "Desolate Gaze", { "SPELL_AURA_APPLIED" }, "", "Move away"), aura_env.Alert.new(244768, "Desolate Gaze", { "SPELL_AURA_APPLIED" }, "", "Move away"),
aura_env.Alert.new(244057, "Enflame Corruption", { "SPELL_CAST_START", "SPELL_AURA_APPLIED" }, "Spread", "Spread!!"), aura_env.Alert.new(
244057,
"Enflame Corruption",
{ "SPELL_CAST_START", "SPELL_AURA_APPLIED" },
"Spread",
"Spread!!"
),
aura_env.Alert.new(244131, "Consuming Sphere", { "SPELL_AURA_APPLIED" }, "Move", ""), aura_env.Alert.new(244131, "Consuming Sphere", { "SPELL_AURA_APPLIED" }, "Move", ""),
aura_env.Alert.new(244056, "Siphon Corruption", { "SPELL_CAST_START", "SPELL_AURA_APPLIED" }, "Stack", "Stack!!"), aura_env.Alert.new(244056, "Siphon Corruption", { "SPELL_CAST_START", "SPELL_AURA_APPLIED" }, "Stack", "Stack!!"),
-- Antoran High Command -- Antoran High Command
@@ -504,9 +508,7 @@ local alerts = {
aura_env.EventMap = {} aura_env.EventMap = {}
for _, alert in ipairs(alerts) do for _, alert in ipairs(alerts) do
for event, _ in pairs(alert.events) do for event, _ in pairs(alert.events) do
if not aura_env.EventMap[event] then if not aura_env.EventMap[event] then aura_env.EventMap[event] = {} end
aura_env.EventMap[event] = {}
end
aura_env.EventMap[event][alert.id] = alert aura_env.EventMap[event][alert.id] = alert
end end
end end

View File

@@ -6,7 +6,7 @@ aura_env.Stack = {
---@return Stack ---@return Stack
new = function(maxSize) new = function(maxSize)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = aura_env.Stack __index = aura_env.Stack,
}) })
self.maxSize = maxSize self.maxSize = maxSize
self.values = {} self.values = {}
@@ -16,9 +16,7 @@ aura_env.Stack = {
---@param value number ---@param value number
Push = function(self, value) Push = function(self, value)
table.insert(self.values, 0, value) table.insert(self.values, 0, value)
if #self.values > self.maxSize then if #self.values > self.maxSize then table.remove(self.values, #self.values) end
table.remove(self.values, #self.values)
end
end, end,
---@param self Stack ---@param self Stack
---@return number ---@return number
@@ -26,9 +24,7 @@ aura_env.Stack = {
local first = self.values[#self.values] local first = self.values[#self.values]
local last = time() local last = time()
if first and last then if first and last then return #self.values / (math.max(last - first, 1)) end
return #self.values / (math.max(last - first, 1))
end
return 0 return 0
end, end,
---@param self Stack ---@param self Stack
@@ -37,9 +33,7 @@ aura_env.Stack = {
local timeThresh = time() - (threshold or aura_env.config.combatMemoryTime) local timeThresh = time() - (threshold or aura_env.config.combatMemoryTime)
-- print(string.format("Clean %d %d", #self.values, timeThresh)) -- print(string.format("Clean %d %d", #self.values, timeThresh))
for i = #self.values, 1, -1 do for i = #self.values, 1, -1 do
if self.values[i] < timeThresh then if self.values[i] < timeThresh then table.remove(self.values, i) end
table.remove(self.values, i)
end
end end
-- print(string.format("Clean after %d", #self.values)) -- print(string.format("Clean after %d", #self.values))
end, end,

View File

@@ -28,7 +28,7 @@ aura_env.raceMap = {
["Void Elf"] = "Alliance", ["Void Elf"] = "Alliance",
["Lightforged Draenei"] = "Alliance", ["Lightforged Draenei"] = "Alliance",
["Mechagnome"] = "Alliance", ["Mechagnome"] = "Alliance",
["Mag'har Orc"] = "Horde" ["Mag'har Orc"] = "Horde",
} }
local throttleTimer = aura_env.config.throttle or 10 local throttleTimer = aura_env.config.throttle or 10
@@ -40,20 +40,16 @@ local throttleMap = {}
aura_env.NotifySpotted = function(playerName, race) aura_env.NotifySpotted = function(playerName, race)
local now = GetTime() local now = GetTime()
local throttleTime = throttleMap[playerName] or 0 local throttleTime = throttleMap[playerName] or 0
if now - throttleTime < throttleTimer then if now - throttleTime < throttleTimer then return end
return
end
throttleMap[playerName] = now throttleMap[playerName] = now
local zone = aura_env.config.zone local zone = aura_env.config.zone
if not zone or zone == "" then if not zone or zone == "" then zone = GetZoneText() .. " " .. GetSubZoneText() end
zone = GetZoneText() .. " " .. GetSubZoneText()
end
local message = { local message = {
channel = "CHANNEL", channel = "CHANNEL",
data = aura_env.config.channel, data = aura_env.config.channel,
message = string.format("I see %s at %s!", playerName, zone) message = string.format("I see %s at %s!", playerName, zone),
} }
table.insert(WeakAurasSaved.Cyka.MessageQueue, message) table.insert(WeakAurasSaved.Cyka.MessageQueue, message)
end end

View File

@@ -26,7 +26,7 @@ Player = {
---@return Player ---@return Player
new = function(name) new = function(name)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = Player __index = Player,
}) })
self.name = name self.name = name
self.whoQueued = false self.whoQueued = false
@@ -41,21 +41,19 @@ Player = {
QueryWho = function(self) QueryWho = function(self)
if aura_env.whoQueued then if aura_env.whoQueued then
print(string.format("There is already a who query queued, waiting for player %s", self.name)) print(string.format("There is already a who query queued, waiting for player %s", self.name))
C_Timer.After(0.5, function() C_Timer.After(0.5, function() self:QueryWho() end)
self:QueryWho()
end)
return return
end end
if self.whoQueued then if self.whoQueued then
print(string.format("Player %s is already queued", self.name)) print(string.format("Player %s is already queued", self.name))
return return
end end
local query = string.format("n-\"%s\"", self.name) local query = string.format('n-"%s"', self.name)
print(string.format("Queueing who query for player %s: %s", self.name, query)) print(string.format("Queueing who query for player %s: %s", self.name, query))
self.whoQueued = true self.whoQueued = true
aura_env.whoQueued = true aura_env.whoQueued = true
SendWho(query) SendWho(query)
end end,
} }
--[09:01 PM] Dump: value=GetChannelList() --[09:01 PM] Dump: value=GetChannelList()

View File

@@ -13,10 +13,9 @@ aura_env.challengeNameMap = {
[227] = "Return to Karazhan: Lower", [227] = "Return to Karazhan: Lower",
[233] = "Cathedral of Eternal Night", [233] = "Cathedral of Eternal Night",
[234] = "Return to Karazhan: Upper", [234] = "Return to Karazhan: Upper",
[239] = "Seat of the Triumvirate" [239] = "Seat of the Triumvirate",
} }
---@class Key ---@class Key
---@field name string ---@field name string
---@field role string ---@field role string
@@ -39,18 +38,27 @@ aura_env.Key = {
local formattedScore, err = aura_env.ScoreColorer.Interpolate(self.score) local formattedScore, err = aura_env.ScoreColorer.Interpolate(self.score)
if not err then if not err then
score = string.format("|cff%02x%02x%02x%d|r", formattedScore.r * 255, formattedScore.g * 255, score = string.format(
formattedScore.b * 255, self.score) "|cff%02x%02x%02x%d|r",
formattedScore.r * 255,
formattedScore.g * 255,
formattedScore.b * 255,
self.score
)
end end
local formattedLevel, err = aura_env.KeyLevel.Interpolate(keyLevel) local formattedLevel, err = aura_env.KeyLevel.Interpolate(keyLevel)
if not err then if not err then
level = string.format("|cff%02x%02x%02x%s|r", formattedLevel.r * 255, formattedLevel.g * 255, level = string.format(
formattedLevel.b * 255, self.level) "|cff%02x%02x%02x%s|r",
formattedLevel.r * 255,
formattedLevel.g * 255,
formattedLevel.b * 255,
self.level
)
end end
return string.format("%-30s %-8s %-8s %-10s %-10s", self.name, self.role, level, self.time, return string.format("%-30s %-8s %-8s %-10s %-10s", self.name, self.role, level, self.time, score)
score)
end, end,
}) })
self.name = name self.name = name
@@ -61,9 +69,7 @@ aura_env.Key = {
return self return self
end, end,
---@return string ---@return string
hash = function(self) hash = function(self) return table.concat({ self.name, self.role, self.level, self.time, self.score }, "/") end,
return table.concat({ self.name, self.role, self.level, self.time, self.score }, "/")
end,
---@param self Key ---@param self Key
---@param other Key ---@param other Key
@@ -71,9 +77,7 @@ aura_env.Key = {
compareTo = function(self, other) compareTo = function(self, other)
if not self then return true end if not self then return true end
if not other then return false end if not other then return false end
if self.name <= other.name then if self.name <= other.name then return true end
return true
end
return false return false
end, end,
---@param self Key ---@param self Key
@@ -81,5 +85,5 @@ aura_env.Key = {
if not WeakAurasSaved.Cyka then WeakAurasSaved.Cyka = {} end if not WeakAurasSaved.Cyka then WeakAurasSaved.Cyka = {} end
if not WeakAurasSaved.Cyka.MData then WeakAurasSaved.Cyka.MData = {} end if not WeakAurasSaved.Cyka.MData then WeakAurasSaved.Cyka.MData = {} end
WeakAurasSaved.Cyka.MData[self:hash()] = self WeakAurasSaved.Cyka.MData[self:hash()] = self
end end,
} }

View File

@@ -16,12 +16,8 @@ aura_env.Units = {
aura_env.HasDispellableDebuff = function(unit) aura_env.HasDispellableDebuff = function(unit)
for i = 1, 20 do for i = 1, 20 do
local debuff, _, _, _, type = UnitDebuff(unit, i) local debuff, _, _, _, type = UnitDebuff(unit, i)
if debuff == nil then if debuff == nil then return false, nil end
return false, nil if type == "Magic" then return true, nil end
end
if type == "Magic" then
return true, nil
end
end end
return false, nil return false, nil
@@ -30,33 +26,23 @@ end
---@param frame Frame ---@param frame Frame
---@return string, nil|string ---@return string, nil|string
aura_env.GetNameFromFrame = function(frame) aura_env.GetNameFromFrame = function(frame)
if frame == nil then if frame == nil then return "", "Frame is nil" end
return "", "Frame is nil"
end
---@diagnostic disable-next-line: undefined-field ---@diagnostic disable-next-line: undefined-field
if frame.Name == nil then if frame.Name == nil then return "", "Frame.Name is nil" end
return "", "Frame.Name is nil"
end
---@diagnostic disable-next-line: undefined-field ---@diagnostic disable-next-line: undefined-field
local name = frame.Name:GetText() local name = frame.Name:GetText()
if name == nil then if name == nil then return "", "Frame.Name.GetText is nil" end
return "", "Frame.Name.GetText is nil"
end
return name, nil return name, nil
end end
---@param name string ---@param name string
---@return Frame|nil ---@return Frame|nil
aura_env.GetFrameFromName = function(name) aura_env.GetFrameFromName = function(name) return aura_env.PartyCache[name] end
return aura_env.PartyCache[name]
end
---@param name string ---@param name string
---@return string ---@return string
---@return number ---@return number
aura_env.RemoveNamePadding = function(name) aura_env.RemoveNamePadding = function(name) return string.gsub(name, "|c%w%w%w%w%w%w%w%w", "", 1) end
return string.gsub(name, "|c%w%w%w%w%w%w%w%w", "", 1)
end
aura_env.MakeFrameGlow = function(frame) aura_env.MakeFrameGlow = function(frame)
local frameName = frame:GetName() local frameName = frame:GetName()

View File

@@ -1,9 +1,5 @@
if not WeakAurasSaved.Cyka then if not WeakAurasSaved.Cyka then WeakAurasSaved.Cyka = {} end
WeakAurasSaved.Cyka = {} if not WeakAurasSaved.Cyka.WhoSniffer then WeakAurasSaved.Cyka.WhoSniffer = {} end
end
if not WeakAurasSaved.Cyka.WhoSniffer then
WeakAurasSaved.Cyka.WhoSniffer = {}
end
aura_env.ignored = { "Maritza", "Goodbones" } aura_env.ignored = { "Maritza", "Goodbones" }
@@ -23,9 +19,7 @@ aura_env.ignored = {"Maritza", "Goodbones"}
---@param input string ---@param input string
---@return number ---@return number
local function utf8len(input) local function utf8len(input)
if not input then if not input then return 0 end
return 0
end
local len = 0 local len = 0
local i = 1 local i = 1
local n = #input local n = #input
@@ -72,30 +66,24 @@ WHOQuery = {
---@return WHOQuery ---@return WHOQuery
new = function(query, filters) new = function(query, filters)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = WHOQuery __index = WHOQuery,
}) })
self.query = query self.query = query
self.filters = filters self.filters = filters
return self return self
end end,
} }
---@alias WHOFilter fun(name: string, guild: string, level: number, race: string, class: string, zone: string): boolean ---@alias WHOFilter fun(name: string, guild: string, level: number, race: string, class: string, zone: string): boolean
---@type WHOFilter ---@type WHOFilter
local NotSiegeOfOrgrimmarFilter = function(name, guild, level, race, class, zone) local NotSiegeOfOrgrimmarFilter = function(name, guild, level, race, class, zone)
if not zone then if not zone then return false end
return false
end
return zone ~= "Siege of Orgrimmar" return zone ~= "Siege of Orgrimmar"
end end
---@type WHOFilter ---@type WHOFilter
local AllianceFilter = function(name, guild, level, race, class, zone) local AllianceFilter = function(name, guild, level, race, class, zone)
if not race then if not race then return false end
return false if not aura_env.raceMap[race] then return false end
end
if not aura_env.raceMap[race] then
return false
end
return aura_env.raceMap[race] == "Alliance" return aura_env.raceMap[race] == "Alliance"
end end
@@ -104,25 +92,27 @@ end
---@field channel string ---@field channel string
---@field data string ---@field data string
if not WeakAurasSaved.Cyka.MessageQueue then if not WeakAurasSaved.Cyka.MessageQueue then WeakAurasSaved.Cyka.MessageQueue = {} end
WeakAurasSaved.Cyka.MessageQueue = {}
end
aura_env.whoQueryIdx = 1 aura_env.whoQueryIdx = 1
---@type table<number, WHOQuery> ---@type table<number, WHOQuery>
aura_env.whoQueries = {} aura_env.whoQueries = {}
aura_env.whoQueries[1] = WHOQuery.new("g-\"БеспредеЛ\"", {}) aura_env.whoQueries[1] = WHOQuery.new('g-"БеспредеЛ"', {})
aura_env.whoQueries[2] = WHOQuery.new( aura_env.whoQueries[2] = WHOQuery.new(
"z-\"Orgrimmar\" z-\"Durotar\" z-\"Valley of Trials\" z-\"Echo Isles\" r-\"Human\" r-\"Dwarf\" r-\"Night Elf\"", 'z-"Orgrimmar" z-"Durotar" z-"Valley of Trials" z-"Echo Isles" r-"Human" r-"Dwarf" r-"Night Elf"',
{NotSiegeOfOrgrimmarFilter, AllianceFilter}) { NotSiegeOfOrgrimmarFilter, AllianceFilter }
)
aura_env.whoQueries[3] = WHOQuery.new( aura_env.whoQueries[3] = WHOQuery.new(
"z-\"Orgrimmar\" z-\"Durotar\" z-\"Valley of Trials\" z-\"Echo Isles\" r-\"Gnome\" r-\"Draenei\" r-\"Worgen\"", 'z-"Orgrimmar" z-"Durotar" z-"Valley of Trials" z-"Echo Isles" r-"Gnome" r-"Draenei" r-"Worgen"',
{NotSiegeOfOrgrimmarFilter, AllianceFilter}) { NotSiegeOfOrgrimmarFilter, AllianceFilter }
)
aura_env.whoQueries[4] = WHOQuery.new( aura_env.whoQueries[4] = WHOQuery.new(
"z-\"Orgrimmar\" z-\"Durotar\" z-\"Valley of Trials\" z-\"Echo Isles\" r-\"Kul Tiran\" r-\"Dark Iron Dwarf\" r-\"Void Elf\"", 'z-"Orgrimmar" z-"Durotar" z-"Valley of Trials" z-"Echo Isles" r-"Kul Tiran" r-"Dark Iron Dwarf" r-"Void Elf"',
{NotSiegeOfOrgrimmarFilter, AllianceFilter}) { NotSiegeOfOrgrimmarFilter, AllianceFilter }
)
aura_env.whoQueries[5] = WHOQuery.new( aura_env.whoQueries[5] = WHOQuery.new(
"z-\"Orgrimmar\" z-\"Durotar\" z-\"Valley of Trials\" z-\"Echo Isles\" r-\"Lightforged Draenei\" r-\"Mechagnome\"", 'z-"Orgrimmar" z-"Durotar" z-"Valley of Trials" z-"Echo Isles" r-"Lightforged Draenei" r-"Mechagnome"',
{NotSiegeOfOrgrimmarFilter, AllianceFilter}) { NotSiegeOfOrgrimmarFilter, AllianceFilter }
)
aura_env.whoQueries[6] = WHOQuery.new("Kekv Demonboo Dotmada Firobot Verminal", {}) aura_env.whoQueries[6] = WHOQuery.new("Kekv Demonboo Dotmada Firobot Verminal", {})
aura_env.queryPending = false aura_env.queryPending = false
aura_env.ttl = #aura_env.whoQueries * 2 aura_env.ttl = #aura_env.whoQueries * 2
@@ -150,7 +140,7 @@ aura_env.raceMap = {
["Void Elf"] = "Alliance", ["Void Elf"] = "Alliance",
["Lightforged Draenei"] = "Alliance", ["Lightforged Draenei"] = "Alliance",
["Mechagnome"] = "Alliance", ["Mechagnome"] = "Alliance",
["Mag'har Orc"] = "Horde" ["Mag'har Orc"] = "Horde",
} }
---@type table<string, Player> ---@type table<string, Player>
@@ -175,7 +165,7 @@ Player = {
---@return Player ---@return Player
new = function(name, guild, race, class, zone) new = function(name, guild, race, class, zone)
local self = setmetatable({}, { local self = setmetatable({}, {
__index = Player __index = Player,
}) })
self.name = name self.name = name
self.guild = guild self.guild = guild
@@ -189,11 +179,17 @@ Player = {
return self return self
end, end,
ToString = function(self) ToString = function(self)
local out = string.format("%s %s %s\nFirst: %s Last: %s Seen: %3d", padString(self.name, 16, true), local out = string.format(
padString(self.guild, 26, false), padString(self.zone, 26, false), padString(self.firstSeen, 10, true), "%s %s %s\nFirst: %s Last: %s Seen: %3d",
padString(self.lastSeen, 10, true), self.seenCount) padString(self.name, 16, true),
padString(self.guild, 26, false),
padString(self.zone, 26, false),
padString(self.firstSeen, 10, true),
padString(self.lastSeen, 10, true),
self.seenCount
)
return string.format("|cFF%s%s|r", aura_env.classColors[self.class], out) return string.format("|cFF%s%s|r", aura_env.classColors[self.class], out)
end end,
} }
---@type table<string, string> ---@type table<string, string>
@@ -209,19 +205,15 @@ aura_env.classColors = {
["Warlock"] = "8788EE", ["Warlock"] = "8788EE",
["Monk"] = "00FF98", ["Monk"] = "00FF98",
["Druid"] = "FF7C0A", ["Druid"] = "FF7C0A",
["Demon Hunter"] = "A330C9" ["Demon Hunter"] = "A330C9",
} }
---@param input string ---@param input string
---@param deliminer string ---@param deliminer string
---@return string[], string|nil ---@return string[], string|nil
local function StrSplit(input, deliminer) local function StrSplit(input, deliminer)
if not deliminer then if not deliminer then return {}, "deliminer is nil" end
return {}, "deliminer is nil" if not input then return {}, "input is nil" end
end
if not input then
return {}, "input is nil"
end
local parts = {} local parts = {}
for part in string.gmatch(input, "([^" .. deliminer .. "]+)") do for part in string.gmatch(input, "([^" .. deliminer .. "]+)") do
table.insert(parts, strtrim(part)) table.insert(parts, strtrim(part))
@@ -244,8 +236,16 @@ end
---@param player Player ---@param player Player
---@return string ---@return string
aura_env.MakeNotifyMessage = function(player) aura_env.MakeNotifyMessage = function(player)
return string.format("%s of class %s and guild %s in %s, first seen: %s, last seen: %s, times seen: %d", return string.format(
player.name, player.class, player.guild, player.zone, player.firstSeen, player.lastSeen, player.seenCount) "%s of class %s and guild %s in %s, first seen: %s, last seen: %s, times seen: %d",
player.name,
player.class,
player.guild,
player.zone,
player.firstSeen,
player.lastSeen,
player.seenCount
)
end end
---@param msg string ---@param msg string
local NotifyAll = function(msg) local NotifyAll = function(msg)
@@ -254,7 +254,7 @@ local NotifyAll = function(msg)
local message = { local message = {
channel = "WHISPER", channel = "WHISPER",
data = rec, data = rec,
message = msg message = msg,
} }
table.insert(WeakAurasSaved.Cyka.MessageQueue, message) table.insert(WeakAurasSaved.Cyka.MessageQueue, message)
end end
@@ -264,7 +264,7 @@ local NotifyChannel = function(msg)
local message = { local message = {
channel = "CHANNEL", channel = "CHANNEL",
data = aura_env.config.channel, data = aura_env.config.channel,
message = msg message = msg,
} }
table.insert(WeakAurasSaved.Cyka.MessageQueue, message) table.insert(WeakAurasSaved.Cyka.MessageQueue, message)
end end
@@ -272,9 +272,7 @@ end
---@param player Player ---@param player Player
---@return nil ---@return nil
aura_env.Notify = function(player) aura_env.Notify = function(player)
if not notifyFor[player.zone] then if not notifyFor[player.zone] then return end
return
end
local msg = aura_env.MakeNotifyMessage(player) local msg = aura_env.MakeNotifyMessage(player)
NotifyAll(msg) NotifyAll(msg)
aura_env.NotifyChannel(player) aura_env.NotifyChannel(player)
@@ -284,11 +282,9 @@ end
---@param newzone string ---@param newzone string
---@return nil ---@return nil
aura_env.NotifyZoneChanged = function(player, newzone) aura_env.NotifyZoneChanged = function(player, newzone)
if not notifyFor[newzone] then if not notifyFor[newzone] then return end
return local msg =
end string.format("%s of class %s and guild %s moved to %s", player.name, player.class, player.guild, newzone)
local msg = string.format("%s of class %s and guild %s moved to %s", player.name, player.class, player.guild,
newzone)
NotifyAll(msg) NotifyAll(msg)
NotifyChannel(msg) NotifyChannel(msg)
end end
@@ -296,11 +292,9 @@ end
---@param player Player ---@param player Player
---@return nil ---@return nil
aura_env.NotifyGone = function(player) aura_env.NotifyGone = function(player)
if not notifyFor[player.zone] then if not notifyFor[player.zone] then return end
return local msg =
end string.format("%s of class %s and guild %s left %s", player.name, player.class, player.guild, player.zone)
local msg = string.format("%s of class %s and guild %s left %s", player.name, player.class, player.guild,
player.zone)
NotifyAll(msg) NotifyAll(msg)
aura_env.NotifyChannelGone(player) aura_env.NotifyChannelGone(player)
end end
@@ -315,8 +309,8 @@ end
---@param player Player ---@param player Player
---@return nil ---@return nil
aura_env.NotifyChannelGone = function(player) aura_env.NotifyChannelGone = function(player)
local msg = string.format("%s of class %s and guild %s left %s", player.name, player.class, player.guild, local msg =
player.zone) string.format("%s of class %s and guild %s left %s", player.name, player.class, player.guild, player.zone)
NotifyChannel(msg) NotifyChannel(msg)
end end
@@ -325,9 +319,7 @@ aura_env.GetChannelName= function(channelId)
for i = 1, #channels, 2 do for i = 1, #channels, 2 do
local id = channels[i] local id = channels[i]
local name = channels[i + 1] local name = channels[i + 1]
if id == channelId then if id == channelId then return name end
return name
end
end end
return nil return nil
end end

View File

@@ -59,8 +59,6 @@ Colorer = {
---@param b number ---@param b number
---@param t number ---@param t number
---@return number ---@return number
lerp = function(a, b, t) lerp = function(a, b, t) return a * (1 - t) + b * t end,
return a * (1 - t) + b * t
end
} }
setmetatable(Colorer, { __index = Colorer }) setmetatable(Colorer, { __index = Colorer })

View File

@@ -1,8 +1,16 @@
aura_env.keybind = "" aura_env.keybind = ""
aura_env.scanned = false aura_env.scanned = false
aura_env.bars = { aura_env.bars = {
"ElvUI_Bar1", "ElvUI_Bar2", "ElvUI_Bar3", "ElvUI_Bar4", "ElvUI_Bar5", "ElvUI_Bar1",
"ElvUI_Bar6", "ElvUI_Bar7", "ElvUI_Bar8", "ElvUI_Bar9", "ElvUI_Bar10" "ElvUI_Bar2",
"ElvUI_Bar3",
"ElvUI_Bar4",
"ElvUI_Bar5",
"ElvUI_Bar6",
"ElvUI_Bar7",
"ElvUI_Bar8",
"ElvUI_Bar9",
"ElvUI_Bar10",
} }
aura_env.lookup = function() aura_env.lookup = function()
@@ -13,9 +21,7 @@ aura_env.lookup = function()
end end
local triggerInfo = aura_env.states[2] local triggerInfo = aura_env.states[2]
if not triggerInfo then if not triggerInfo then triggerInfo = aura_env.states[1] end
triggerInfo = aura_env.states[1]
end
if triggerInfo then spellid = triggerInfo.trigger.spellName end if triggerInfo then spellid = triggerInfo.trigger.spellName end
if spellid == 0 then return end if spellid == 0 then return end

2
NewAge

Submodule NewAge updated: 37df5a0610...3fa9e6c087

View File

@@ -1,6 +1,60 @@
local cc = local cc = {
{ "Gnaw",
"Gnaw", "Hungering Cold", "Bash", "Cyclone", "Entangling Roots", "Hibernate", "Maim", "Pounce", "Entrapment", "Freezing Trap", "Pin", "Scare Beast", "Scatter Shot", "Intimidation", "Ravage", "Sonic Blast", "Wyvern Sting", "Deep Freeze", "Dragon's Breath", "Frost Nova", "Polymorph", "Shattered Barrier", "Slow", "Frostbolt", "Hammer of Justice", "Holy Wrath", "Repentance", "Seal of Justice", "Turn Evil", "Mind Control", "Psychic Horror", "Psychic Scream", "Shackle Undead", "Holy Word: Chastise", "Sin and Punishment", "Blind", "Cheap Shot", "Gouge", "Kidney Shot", "Sap", "Earthbind Totem", "Stoneclaw Totem", "Hex", "Banish", "Death Coil", "Fear", "Howl of Terror", "Intercept", "Seduction", "Shadowfury", "Charge", "Concussion Blow", "Hamstring", "Improved Hamstring", "Intimidating Shout", "Shockwave" "Hungering Cold",
"Bash",
"Cyclone",
"Entangling Roots",
"Hibernate",
"Maim",
"Pounce",
"Entrapment",
"Freezing Trap",
"Pin",
"Scare Beast",
"Scatter Shot",
"Intimidation",
"Ravage",
"Sonic Blast",
"Wyvern Sting",
"Deep Freeze",
"Dragon's Breath",
"Frost Nova",
"Polymorph",
"Shattered Barrier",
"Slow",
"Frostbolt",
"Hammer of Justice",
"Holy Wrath",
"Repentance",
"Seal of Justice",
"Turn Evil",
"Mind Control",
"Psychic Horror",
"Psychic Scream",
"Shackle Undead",
"Holy Word: Chastise",
"Sin and Punishment",
"Blind",
"Cheap Shot",
"Gouge",
"Kidney Shot",
"Sap",
"Earthbind Totem",
"Stoneclaw Totem",
"Hex",
"Banish",
"Death Coil",
"Fear",
"Howl of Terror",
"Intercept",
"Seduction",
"Shadowfury",
"Charge",
"Concussion Blow",
"Hamstring",
"Improved Hamstring",
"Intimidating Shout",
"Shockwave",
} }
local hashtable = {} local hashtable = {}
local spellarray = {} local spellarray = {}

View File

@@ -13,9 +13,7 @@ end
function TomTom:AddZWaypoint(c, z, x, y, desc, persistent, minimap, world, callbacks, silent, crazy) function TomTom:AddZWaypoint(c, z, x, y, desc, persistent, minimap, world, callbacks, silent, crazy)
-- Convert the c,z,x,y tuple to m,f,x,y and pass the work off to AddMFWaypoint() -- Convert the c,z,x,y tuple to m,f,x,y and pass the work off to AddMFWaypoint()
local mapId, floor = hbd:GetMapIDFromCZ(c, z) local mapId, floor = hbd:GetMapIDFromCZ(c, z)
if not mapId then if not mapId then return end
return
end
return self:AddMFWaypoint(mapId, floor, x / 100, y / 100, { return self:AddMFWaypoint(mapId, floor, x / 100, y / 100, {
title = desc, title = desc,
@@ -30,9 +28,7 @@ end
function TomTom:AddWaypointToCurrentZone(x, y, desc) function TomTom:AddWaypointToCurrentZone(x, y, desc)
local m, f = TomTom:GetCurrentPlayerPosition() local m, f = TomTom:GetCurrentPlayerPosition()
if not m then if not m then return end
return
end
return self:AddMFWaypoint(m, f, x / 100, y / 100, { return self:AddMFWaypoint(m, f, x / 100, y / 100, {
title = desc, title = desc,
@@ -43,7 +39,6 @@ function TomTom:SetCustomWaypoint(c,z,x,y,callback,minimap,world,silent)
return self:AddZWaypoint(c, z, x, y, nil, false, minimap, world, callback, silent) return self:AddZWaypoint(c, z, x, y, nil, false, minimap, world, callback, silent)
end end
function TomTom:SetCustomMFWaypoint(m, f, x, y, opts) function TomTom:SetCustomMFWaypoint(m, f, x, y, opts)
opts.persistent = false opts.persistent = false

View File

@@ -9,9 +9,7 @@ function TomTom:AddMFWaypoint(m, f, x, y, opts)
if opts.cleardistance == nil then opts.cleardistance = self.profile.persistence.cleardistance end if opts.cleardistance == nil then opts.cleardistance = self.profile.persistence.cleardistance end
if opts.arrivaldistance == nil then opts.arrivaldistance = self.profile.arrow.arrival end if opts.arrivaldistance == nil then opts.arrivaldistance = self.profile.arrow.arrival end
if not opts.callbacks then if not opts.callbacks then opts.callbacks = TomTom:DefaultCallbacks(opts) end
opts.callbacks = TomTom:DefaultCallbacks(opts)
end
local zoneName = hbd:GetLocalizedMap(m) local zoneName = hbd:GetLocalizedMap(m)
@@ -23,33 +21,25 @@ function TomTom:AddMFWaypoint(m, f, x, y, opts)
-- Ensure there isn't already a waypoint at this location -- Ensure there isn't already a waypoint at this location
local key = self:GetKey({ m, f, x, y, title = opts.title }) local key = self:GetKey({ m, f, x, y, title = opts.title })
if waypoints[m] and waypoints[m][key] then if waypoints[m] and waypoints[m][key] then return waypoints[m][key] end
return waypoints[m][key]
end
-- uid is the 'new waypoint' called this for historical reasons -- uid is the 'new waypoint' called this for historical reasons
local uid = { m, f, x, y, title = opts.title } local uid = { m, f, x, y, title = opts.title }
-- Copy over any options, so we have em -- Copy over any options, so we have em
for k, v in pairs(opts) do for k, v in pairs(opts) do
if not uid[k] then if not uid[k] then uid[k] = v end
uid[k] = v
end
end end
-- No need to convert x and y because they're already 0-1 instead of 0-100 -- No need to convert x and y because they're already 0-1 instead of 0-100
self:SetWaypoint(uid, opts.callbacks, opts.minimap, opts.world) self:SetWaypoint(uid, opts.callbacks, opts.minimap, opts.world)
if opts.crazy then if opts.crazy then self:SetCrazyArrow(uid, opts.arrivaldistance, opts.title) end
self:SetCrazyArrow(uid, opts.arrivaldistance, opts.title)
end
waypoints[m] = waypoints[m] or {} waypoints[m] = waypoints[m] or {}
waypoints[m][key] = uid waypoints[m][key] = uid
-- If this is a persistent waypoint, then add it to the waypoints table -- If this is a persistent waypoint, then add it to the waypoints table
if opts.persistent then if opts.persistent then self.waypointprofile[m][key] = uid end
self.waypointprofile[m][key] = uid
end
if not opts.silent and self.profile.general.announce then if not opts.silent and self.profile.general.announce then
local ctxt = RoundCoords(x, y, 2) local ctxt = RoundCoords(x, y, 2)

View File

@@ -166,15 +166,11 @@ function TomTom:Initialize(event, addon)
local coordFeedFrame = CreateFrame("Frame") local coordFeedFrame = CreateFrame("Frame")
local throttle, counter = self.db.profile.feeds.coords_throttle, 0 local throttle, counter = self.db.profile.feeds.coords_throttle, 0
function TomTom:_privateupdatecoordthrottle(x) function TomTom:_privateupdatecoordthrottle(x) throttle = x end
throttle = x
end
coordFeedFrame:SetScript("OnUpdate", function(self, elapsed) coordFeedFrame:SetScript("OnUpdate", function(self, elapsed)
counter = counter + elapsed counter = counter + elapsed
if counter < throttle then if counter < throttle then return end
return
end
counter = 0 counter = 0
local m, f, x, y = TomTom:GetCurrentPlayerPosition() local m, f, x, y = TomTom:GetCurrentPlayerPosition()
@@ -216,10 +212,8 @@ end
-- weird if you zoom the map out to your parent, but there is no way to -- weird if you zoom the map out to your parent, but there is no way to
-- recover this without changing/setting the map zoom. Deal with it =) -- recover this without changing/setting the map zoom. Deal with it =)
function TomTom:GetCurrentCoords() function TomTom:GetCurrentCoords()
local x, y = GetPlayerMapPosition("player"); local x, y = GetPlayerMapPosition("player")
if x and y and x > 0 and y > 0 then if x and y and x > 0 and y > 0 then return x, y end
return x, y
end
end end
function TomTom:GetCurrentPlayerPosition() function TomTom:GetCurrentPlayerPosition()
@@ -305,12 +299,10 @@ function TomTom:ReloadWaypoints()
end end
end end
function TomTom:UpdateCoordFeedThrottle() function TomTom:UpdateCoordFeedThrottle() self:_privateupdatecoordthrottle(self.db.profile.feeds.coords_throttle) end
self:_privateupdatecoordthrottle(self.db.profile.feeds.coords_throttle)
end
-- Hook some global functions so we know when the world map size changes -- Hook some global functions so we know when the world map size changes
local mapSizedUp = not (WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE); local mapSizedUp = not (WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE)
hooksecurefunc("WorldMap_ToggleSizeUp", function() hooksecurefunc("WorldMap_ToggleSizeUp", function()
mapSizedUp = true mapSizedUp = true
TomTom:ShowHideWorldCoords() TomTom:ShowHideWorldCoords()
@@ -345,13 +337,9 @@ function TomTom:ShowHideWorldCoords()
TomTomWorldFrame.Player:Hide() TomTomWorldFrame.Player:Hide()
TomTomWorldFrame.Cursor:Hide() TomTomWorldFrame.Cursor:Hide()
if self.profile.mapcoords.playerenable then if self.profile.mapcoords.playerenable then TomTomWorldFrame.Player:Show() end
TomTomWorldFrame.Player:Show()
end
if self.profile.mapcoords.cursorenable then if self.profile.mapcoords.cursorenable then TomTomWorldFrame.Cursor:Show() end
TomTomWorldFrame.Cursor:Show()
end
-- Show the frame -- Show the frame
TomTomWorldFrame:Show() TomTomWorldFrame:Show()
@@ -415,7 +403,6 @@ function TomTom:ShowHideCoordBlock()
-- Update the font size -- Update the font size
local font, height = TomTomBlock.Text:GetFont() local font, height = TomTomBlock.Text:GetFont()
TomTomBlock.Text:SetFont(font, opt.fontsize, select(3, TomTomBlock.Text:GetFont())) TomTomBlock.Text:SetFont(font, opt.fontsize, select(3, TomTomBlock.Text:GetFont()))
elseif TomTomBlock then elseif TomTomBlock then
TomTomBlock:Hide() TomTomBlock:Hide()
end end
@@ -431,8 +418,8 @@ local world_click_verify = {
local origScript = WorldMapButton_OnClick local origScript = WorldMapButton_OnClick
WorldMapButton_OnClick = function(self, ...) WorldMapButton_OnClick = function(self, ...)
if WorldMapButton.ignoreClick then if WorldMapButton.ignoreClick then
WorldMapButton.ignoreClick = false; WorldMapButton.ignoreClick = false
return; return
end end
local mouseButton, button = ... local mouseButton, button = ...
@@ -447,9 +434,7 @@ WorldMapButton_OnClick = function(self, ...)
local m, f = GetCurrentMapAreaID() local m, f = GetCurrentMapAreaID()
local x, y = GetCurrentCursorPosition() local x, y = GetCurrentCursorPosition()
if not m or m == WORLDMAP_COSMIC_ID then if not m or m == WORLDMAP_COSMIC_ID then return origScript and origScript(self, ...) or true end
return origScript and origScript(self, ...) or true
end
local uid = TomTom:AddMFWaypoint(m, f, x, y, { local uid = TomTom:AddMFWaypoint(m, f, x, y, {
title = L["TomTom waypoint"], title = L["TomTom waypoint"],
@@ -480,7 +465,8 @@ end
--[[------------------------------------------------------------------- --[[-------------------------------------------------------------------
-- Dropdown menu code -- Dropdown menu code
-------------------------------------------------------------------]]-- -------------------------------------------------------------------]]
--
StaticPopupDialogs["TOMTOM_REMOVE_ALL_CONFIRM"] = { StaticPopupDialogs["TOMTOM_REMOVE_ALL_CONFIRM"] = {
preferredIndex = STATICPOPUPS_NUMDIALOGS, preferredIndex = STATICPOPUPS_NUMDIALOGS,
@@ -551,9 +537,7 @@ end,
}, },
{ -- Save this waypoint { -- Save this waypoint
text = L["Save this waypoint between sessions"], text = L["Save this waypoint between sessions"],
checked = function() checked = function() return TomTom:UIDIsSaved(TomTom.dropdown.uid) end,
return TomTom:UIDIsSaved(TomTom.dropdown.uid)
end,
func = function() func = function()
-- Add/remove it from the SV file -- Add/remove it from the SV file
local uid = TomTom.dropdown.uid local uid = TomTom.dropdown.uid
@@ -583,30 +567,22 @@ end,
{ {
-- Party -- Party
text = L["Send to party"], text = L["Send to party"],
func = function() func = function() TomTom:SendWaypoint(TomTom.dropdown.uid, "PARTY") end,
TomTom:SendWaypoint(TomTom.dropdown.uid, "PARTY")
end
}, },
{ {
-- Raid -- Raid
text = L["Send to raid"], text = L["Send to raid"],
func = function() func = function() TomTom:SendWaypoint(TomTom.dropdown.uid, "RAID") end,
TomTom:SendWaypoint(TomTom.dropdown.uid, "RAID")
end
}, },
{ {
-- Battleground -- Battleground
text = L["Send to battleground"], text = L["Send to battleground"],
func = function() func = function() TomTom:SendWaypoint(TomTom.dropdown.uid, "BATTLEGROUND") end,
TomTom:SendWaypoint(TomTom.dropdown.uid, "BATTLEGROUND")
end
}, },
{ {
-- Guild -- Guild
text = L["Send to guild"], text = L["Send to guild"],
func = function() func = function() TomTom:SendWaypoint(TomTom.dropdown.uid, "GUILD") end,
TomTom:SendWaypoint(TomTom.dropdown.uid, "GUILD")
end
}, },
}, },
}, },
@@ -621,9 +597,7 @@ local function init_dropdown(self, level)
-- If a value has been set, try to find it at the current level -- If a value has been set, try to find it at the current level
if level > 1 and UIDROPDOWNMENU_MENU_VALUE then if level > 1 and UIDROPDOWNMENU_MENU_VALUE then
if info[UIDROPDOWNMENU_MENU_VALUE] then if info[UIDROPDOWNMENU_MENU_VALUE] then info = info[UIDROPDOWNMENU_MENU_VALUE] end
info = info[UIDROPDOWNMENU_MENU_VALUE]
end
end end
-- Add the buttons to the menu -- Add the buttons to the menu
@@ -631,7 +605,9 @@ local function init_dropdown(self, level)
if type(entry.checked) == "function" then if type(entry.checked) == "function" then
-- Make this button dynamic -- Make this button dynamic
local new = {} local new = {}
for k,v in pairs(entry) do new[k] = v end for k, v in pairs(entry) do
new[k] = v
end
new.checked = new.checked() new.checked = new.checked()
entry = new entry = new
else else
@@ -653,9 +629,7 @@ function TomTom:UIDIsSaved(uid)
local key = TomTom:GetKey(data) local key = TomTom:GetKey(data)
local mapId = data[1] local mapId = data[1]
if data then if data then return not not TomTom.waypointprofile[mapId][key] end
return not not TomTom.waypointprofile[mapId][key]
end
end end
return false return false
end end
@@ -672,9 +646,7 @@ function TomTom:CHAT_MSG_ADDON(event, prefix, data, channel, sender)
if sender == UnitName("player") then return end if sender == UnitName("player") then return end
local m, f, x, y, title = string.split(":", data) local m, f, x, y, title = string.split(":", data)
if not title:match("%S") then if not title:match("%S") then title = string.format(L["Waypoint from %s"], sender) end
title = string.format(L["Waypoint from %s"], sender)
end
m = tonumber(m) m = tonumber(m)
f = tonumber(f) f = tonumber(f)
@@ -689,7 +661,8 @@ end
--[[------------------------------------------------------------------- --[[-------------------------------------------------------------------
-- Define callback functions -- Define callback functions
-------------------------------------------------------------------]]-- -------------------------------------------------------------------]]
--
local function _minimap_onclick(event, uid, self, button) local function _minimap_onclick(event, uid, self, button)
if TomTom.db.profile.minimap.menu then if TomTom.db.profile.minimap.menu then
TomTom:InitializeDropdown(uid) TomTom:InitializeDropdown(uid)
@@ -746,15 +719,11 @@ end
local function _both_clear_distance(event, uid, range, distance, lastdistance) local function _both_clear_distance(event, uid, range, distance, lastdistance)
-- Only clear the waypoint if we weren't inside it when it was set -- Only clear the waypoint if we weren't inside it when it was set
if lastdistance and not UnitOnTaxi("player") then if lastdistance and not UnitOnTaxi("player") then TomTom:RemoveWaypoint(uid) end
TomTom:RemoveWaypoint(uid)
end
end end
local function _both_ping_arrival(event, uid, range, distance, lastdistance) local function _both_ping_arrival(event, uid, range, distance, lastdistance)
if TomTom.profile.arrow.enablePing then if TomTom.profile.arrow.enablePing then PlaySoundFile("Interface\\AddOns\\TomTom\\Media\\ping.mp3") end
PlaySoundFile("Interface\\AddOns\\TomTom\\Media\\ping.mp3")
end
end end
local function _remove(event, uid) local function _remove(event, uid)
@@ -763,14 +732,10 @@ local function _remove(event, uid)
local mapId = data[1] local mapId = data[1]
local sv = TomTom.waypointprofile[mapId] local sv = TomTom.waypointprofile[mapId]
if sv and sv[key] then if sv and sv[key] then sv[key] = nil end
sv[key] = nil
end
-- Remove this entry from the waypoints table -- Remove this entry from the waypoints table
if waypoints[mapId] then if waypoints[mapId] then waypoints[mapId][key] = nil end
waypoints[mapId][key] = nil
end
end end
local function noop() end local function noop() end
@@ -783,14 +748,10 @@ function TomTom:RemoveWaypoint(uid)
local mapId = data[1] local mapId = data[1]
local sv = TomTom.waypointprofile[mapId] local sv = TomTom.waypointprofile[mapId]
if sv and sv[key] then if sv and sv[key] then sv[key] = nil end
sv[key] = nil
end
-- Remove this entry from the waypoints table -- Remove this entry from the waypoints table
if waypoints[mapId] then if waypoints[mapId] then waypoints[mapId][key] = nil end
waypoints[mapId][key] = nil
end
end end
-- TODO: Make this not suck -- TODO: Make this not suck
@@ -808,9 +769,7 @@ end
function TomTom:AddZWaypoint(c, z, x, y, desc, persistent, minimap, world, callbacks, silent, crazy) function TomTom:AddZWaypoint(c, z, x, y, desc, persistent, minimap, world, callbacks, silent, crazy)
-- Convert the c,z,x,y tuple to m,f,x,y and pass the work off to AddMFWaypoint() -- Convert the c,z,x,y tuple to m,f,x,y and pass the work off to AddMFWaypoint()
local mapId, floor = hbd:GetMapIDFromCZ(c, z) local mapId, floor = hbd:GetMapIDFromCZ(c, z)
if not mapId then if not mapId then return end
return
end
return self:AddMFWaypoint(mapId, floor, x / 100, y / 100, { return self:AddMFWaypoint(mapId, floor, x / 100, y / 100, {
title = desc, title = desc,
@@ -825,9 +784,7 @@ end
function TomTom:AddWaypointToCurrentZone(x, y, desc) function TomTom:AddWaypointToCurrentZone(x, y, desc)
local m, f = TomTom:GetCurrentPlayerPosition() local m, f = TomTom:GetCurrentPlayerPosition()
if not m then if not m then return end
return
end
return self:AddMFWaypoint(m, f, x / 100, y / 100, { return self:AddMFWaypoint(m, f, x / 100, y / 100, {
title = desc, title = desc,
@@ -859,33 +816,24 @@ function TomTom:DefaultCallbacks(opts)
tooltip_show = _world_tooltip_show, tooltip_show = _world_tooltip_show,
tooltip_update = _both_tooltip_show, tooltip_update = _both_tooltip_show,
}, },
distance = { distance = {},
},
} }
local cleardistance = self.profile.persistence.cleardistance local cleardistance = self.profile.persistence.cleardistance
local arrivaldistance = self.profile.arrow.arrival local arrivaldistance = self.profile.arrow.arrival
-- Allow both of these to be overriden by options -- Allow both of these to be overriden by options
if opts.cleardistance then if opts.cleardistance then cleardistance = opts.cleardistance end
cleardistance = opts.cleardistance if opts.arrivaldistance then arrivaldistance = opts.arrivaldistance end
end
if opts.arrivaldistance then
arrivaldistance = opts.arrivaldistance
end
if cleardistance == arrivaldistance then if cleardistance == arrivaldistance then
callbacks.distance[cleardistance] = function(...) callbacks.distance[cleardistance] = function(...)
_both_clear_distance(...); _both_clear_distance(...)
_both_ping_arrival(...); _both_ping_arrival(...)
end end
else else
if cleardistance > 0 then if cleardistance > 0 then callbacks.distance[cleardistance] = _both_clear_distance end
callbacks.distance[cleardistance] = _both_clear_distance if arrivaldistance > 0 then callbacks.distance[arrivaldistance] = _both_ping_arrival end
end
if arrivaldistance > 0 then
callbacks.distance[arrivaldistance] = _both_ping_arrival
end
end end
return callbacks return callbacks
@@ -902,9 +850,7 @@ function TomTom:AddMFWaypoint(m, f, x, y, opts)
if opts.cleardistance == nil then opts.cleardistance = self.profile.persistence.cleardistance end if opts.cleardistance == nil then opts.cleardistance = self.profile.persistence.cleardistance end
if opts.arrivaldistance == nil then opts.arrivaldistance = self.profile.arrow.arrival end if opts.arrivaldistance == nil then opts.arrivaldistance = self.profile.arrow.arrival end
if not opts.callbacks then if not opts.callbacks then opts.callbacks = TomTom:DefaultCallbacks(opts) end
opts.callbacks = TomTom:DefaultCallbacks(opts)
end
local zoneName = hbd:GetLocalizedMap(m) local zoneName = hbd:GetLocalizedMap(m)
@@ -916,33 +862,25 @@ function TomTom:AddMFWaypoint(m, f, x, y, opts)
-- Ensure there isn't already a waypoint at this location -- Ensure there isn't already a waypoint at this location
local key = self:GetKey({ m, f, x, y, title = opts.title }) local key = self:GetKey({ m, f, x, y, title = opts.title })
if waypoints[m] and waypoints[m][key] then if waypoints[m] and waypoints[m][key] then return waypoints[m][key] end
return waypoints[m][key]
end
-- uid is the 'new waypoint' called this for historical reasons -- uid is the 'new waypoint' called this for historical reasons
local uid = { m, f, x, y, title = opts.title } local uid = { m, f, x, y, title = opts.title }
-- Copy over any options, so we have em -- Copy over any options, so we have em
for k, v in pairs(opts) do for k, v in pairs(opts) do
if not uid[k] then if not uid[k] then uid[k] = v end
uid[k] = v
end
end end
-- No need to convert x and y because they're already 0-1 instead of 0-100 -- No need to convert x and y because they're already 0-1 instead of 0-100
self:SetWaypoint(uid, opts.callbacks, opts.minimap, opts.world) self:SetWaypoint(uid, opts.callbacks, opts.minimap, opts.world)
if opts.crazy then if opts.crazy then self:SetCrazyArrow(uid, opts.arrivaldistance, opts.title) end
self:SetCrazyArrow(uid, opts.arrivaldistance, opts.title)
end
waypoints[m] = waypoints[m] or {} waypoints[m] = waypoints[m] or {}
waypoints[m][key] = uid waypoints[m][key] = uid
-- If this is a persistent waypoint, then add it to the waypoints table -- If this is a persistent waypoint, then add it to the waypoints table
if opts.persistent then if opts.persistent then self.waypointprofile[m][key] = uid end
self.waypointprofile[m][key] = uid
end
if not opts.silent and self.profile.general.announce then if not opts.silent and self.profile.general.announce then
local ctxt = RoundCoords(x, y, 2) local ctxt = RoundCoords(x, y, 2)
@@ -1001,9 +939,7 @@ do
local cx = (x / scale - left) / width local cx = (x / scale - left) / width
local cy = (top - y / scale) / height local cy = (top - y / scale) / height
if cx < 0 or cx > 1 or cy < 0 or cy > 1 then if cx < 0 or cx > 1 or cy < 0 or cy > 1 then return nil, nil end
return nil, nil
end
return cx, cy return cx, cy
end end
@@ -1014,13 +950,10 @@ do
return fmt:format(x * 100, y * 100) return fmt:format(x * 100, y * 100)
end end
local coord_throttle = 0 local coord_throttle = 0
function WorldMap_OnUpdate(self, elapsed) function WorldMap_OnUpdate(self, elapsed)
coord_throttle = coord_throttle + elapsed coord_throttle = coord_throttle + elapsed
if coord_throttle <= TomTom.profile.mapcoords.throttle then if coord_throttle <= TomTom.profile.mapcoords.throttle then return end
return
end
coord_throttle = 0 coord_throttle = 0
local x, y = TomTom:GetCurrentCoords() local x, y = TomTom:GetCurrentCoords()
@@ -1062,14 +995,10 @@ do
end end
function Block_OnDragStart(self, button, down) function Block_OnDragStart(self, button, down)
if not TomTom.db.profile.block.lock then if not TomTom.db.profile.block.lock then self:StartMoving() end
self:StartMoving()
end
end end
function Block_OnDragStop(self, button, down) function Block_OnDragStop(self, button, down) self:StopMovingOrSizing() end
self:StopMovingOrSizing()
end
function Block_OnClick(self, button, down) function Block_OnClick(self, button, down)
local m, f, x, y = TomTom:GetCurrentPlayerPosition() local m, f, x, y = TomTom:GetCurrentPlayerPosition()
@@ -1102,7 +1031,9 @@ end
local function usage() local function usage()
ChatFrame1:AddMessage(L["|cffffff78TomTom |r/way |cffffff78Usage:|r"]) ChatFrame1:AddMessage(L["|cffffff78TomTom |r/way |cffffff78Usage:|r"])
ChatFrame1:AddMessage(L["|cffffff78/way <x> <y> [desc]|r - Adds a waypoint at x,y with descrtiption desc"]) ChatFrame1:AddMessage(L["|cffffff78/way <x> <y> [desc]|r - Adds a waypoint at x,y with descrtiption desc"])
ChatFrame1:AddMessage(L["|cffffff78/way <zone> <x> <y> [desc]|r - Adds a waypoint at x,y in zone with description desc"]) ChatFrame1:AddMessage(
L["|cffffff78/way <zone> <x> <y> [desc]|r - Adds a waypoint at x,y in zone with description desc"]
)
ChatFrame1:AddMessage(L["|cffffff78/way reset all|r - Resets all waypoints"]) ChatFrame1:AddMessage(L["|cffffff78/way reset all|r - Resets all waypoints"])
ChatFrame1:AddMessage(L["|cffffff78/way reset <zone>|r - Resets all waypoints in zone"]) ChatFrame1:AddMessage(L["|cffffff78/way reset <zone>|r - Resets all waypoints in zone"])
ChatFrame1:AddMessage(L["|cffffff78/way list|r - Lists active waypoints in current zone"]) ChatFrame1:AddMessage(L["|cffffff78/way list|r - Lists active waypoints in current zone"])
@@ -1141,9 +1072,7 @@ function TomTom:GetClosestWaypoint()
end end
end end
if closest_dist then if closest_dist then return closest_waypoint end
return closest_waypoint
end
end end
function TomTom:SetClosestWaypoint() function TomTom:SetClosestWaypoint()
@@ -1156,17 +1085,13 @@ end
SLASH_TOMTOM_CLOSEST_WAYPOINT1 = "/cway" SLASH_TOMTOM_CLOSEST_WAYPOINT1 = "/cway"
SLASH_TOMTOM_CLOSEST_WAYPOINT2 = "/closestway" SLASH_TOMTOM_CLOSEST_WAYPOINT2 = "/closestway"
SlashCmdList["TOMTOM_CLOSEST_WAYPOINT"] = function(msg) SlashCmdList["TOMTOM_CLOSEST_WAYPOINT"] = function(msg) TomTom:SetClosestWaypoint() end
TomTom:SetClosestWaypoint()
end
SLASH_TOMTOM_WAYBACK1 = "/wayb" SLASH_TOMTOM_WAYBACK1 = "/wayb"
SLASH_TOMTOM_WAYBACK2 = "/wayback" SLASH_TOMTOM_WAYBACK2 = "/wayback"
SlashCmdList["TOMTOM_WAYBACK"] = function(msg) SlashCmdList["TOMTOM_WAYBACK"] = function(msg)
local title = L["Wayback"] local title = L["Wayback"]
if msg and msg:match("%S") then if msg and msg:match("%S") then title = msg end
title = msg
end
local backm, backf, backx, backy = TomTom:GetCurrentPlayerPosition() local backm, backf, backx, backy = TomTom:GetCurrentPlayerPosition()
TomTom:AddMFWaypoint(backm, backf, backx, backy, { TomTom:AddMFWaypoint(backm, backf, backx, backy, {
@@ -1219,7 +1144,7 @@ do
local parent = (c == -1 and a or c) local parent = (c == -1 and a or c)
local parentName = continentNames[parent] or GetMapNameByID(parent) local parentName = continentNames[parent] or GetMapNameByID(parent)
if parentName then if parentName then
local newName = name .. ':' .. parentName local newName = name .. ":" .. parentName
newEntries[newName] = areaId newEntries[newName] = areaId
end end
end end
@@ -1241,7 +1166,9 @@ local function lowergsub(s) return s:lower():gsub("[^%a%d]", "") end
SlashCmdList["TOMTOM_WAY"] = function(msg) SlashCmdList["TOMTOM_WAY"] = function(msg)
msg = msg:gsub("(%d)[%.,] (%d)", "%1 %2"):gsub(wrongseparator, rightseparator) msg = msg:gsub("(%d)[%.,] (%d)", "%1 %2"):gsub(wrongseparator, rightseparator)
local tokens = {} local tokens = {}
for token in msg:gmatch("%S+") do table.insert(tokens, token) end for token in msg:gmatch("%S+") do
table.insert(tokens, token)
end
-- Lower the first token -- Lower the first token
local ltoken = tokens[1] and tokens[1]:lower() local ltoken = tokens[1] and tokens[1]:lower()
@@ -1258,7 +1185,6 @@ SlashCmdList["TOMTOM_WAY"] = function(msg)
StaticPopupDialogs["TOMTOM_REMOVE_ALL_CONFIRM"].OnAccept() StaticPopupDialogs["TOMTOM_REMOVE_ALL_CONFIRM"].OnAccept()
return return
end end
elseif tokens[2] then elseif tokens[2] then
-- Reset the named zone -- Reset the named zone
local zone = table.concat(tokens, " ", 2) local zone = table.concat(tokens, " ", 2)
@@ -1279,13 +1205,20 @@ SlashCmdList["TOMTOM_WAY"] = function(msg)
end end
if #matches > 5 then if #matches > 5 then
local msg = string.format(L["Found %d possible matches for zone %s. Please be more specific"], #matches, zone) local msg =
string.format(L["Found %d possible matches for zone %s. Please be more specific"], #matches, zone)
ChatFrame1:AddMessage(msg) ChatFrame1:AddMessage(msg)
return return
elseif #matches > 1 then elseif #matches > 1 then
table.sort(matches) table.sort(matches)
ChatFrame1:AddMessage(string.format(L["Found multiple matches for zone '%s'. Did you mean: %s"], zone, table.concat(matches, ", "))) ChatFrame1:AddMessage(
string.format(
L["Found multiple matches for zone '%s'. Did you mean: %s"],
zone,
table.concat(matches, ", ")
)
)
return return
elseif #matches == 0 then elseif #matches == 0 then
local msg = string.format(L["Could not find any matches for zone %s."], zone) local msg = string.format(L["Could not find any matches for zone %s."], zone)
@@ -1355,11 +1288,16 @@ SlashCmdList["TOMTOM_WAY"] = function(msg)
end end
if #matches > 5 then if #matches > 5 then
local msg = string.format(L["Found %d possible matches for zone %s. Please be more specific"], #matches, zone) local msg =
string.format(L["Found %d possible matches for zone %s. Please be more specific"], #matches, zone)
ChatFrame1:AddMessage(msg) ChatFrame1:AddMessage(msg)
return return
elseif #matches > 1 then elseif #matches > 1 then
local msg = string.format(L["Found multiple matches for zone '%s'. Did you mean: %s"], zone, table.concat(matches, ", ")) local msg = string.format(
L["Found multiple matches for zone '%s'. Did you mean: %s"],
zone,
table.concat(matches, ", ")
)
ChatFrame1:AddMessage(msg) ChatFrame1:AddMessage(msg)
return return
elseif #matches == 0 then elseif #matches == 0 then
@@ -1375,9 +1313,7 @@ SlashCmdList["TOMTOM_WAY"] = function(msg)
x = x and tonumber(x) x = x and tonumber(x)
y = y and tonumber(y) y = y and tonumber(y)
if not x or not y then if not x or not y then return usage() end
return usage()
end
x = tonumber(x) x = tonumber(x)
y = tonumber(y) y = tonumber(y)
@@ -1392,9 +1328,7 @@ SlashCmdList["TOMTOM_WAY"] = function(msg)
elseif not y or not tonumber(y) then elseif not y or not tonumber(y) then
return usage() return usage()
end end
if desc then if desc then desc = table.concat(tokens, " ", 3) end
desc = table.concat(tokens, " ", 3)
end
x = tonumber(x) x = tonumber(x)
y = tonumber(y) y = tonumber(y)
@@ -1408,4 +1342,3 @@ SlashCmdList["TOMTOM_WAY"] = function(msg)
return usage() return usage()
end end
end end

View File

@@ -1,4 +1,3 @@
aura_env.addtostring = function(s, ...) aura_env.addtostring = function(s, ...)
local i = 1 local i = 1
while select(i, ...) do while select(i, ...) do

View File

@@ -1,48 +1,90 @@
aura_env.classColor = function(class) aura_env.classColor = function(class)
if class == 6 then return "\124cFFC41F3B" elseif if class == 6 then
class == 12 then return "\124cFFA330C9" elseif return "\124cFFC41F3B"
class == 11 then return "\124cFFFF7D0A" elseif elseif class == 12 then
class == 3 then return "\124cFFABD473" elseif return "\124cFFA330C9"
class == 8 then return "\124cFF40C7EB" elseif elseif class == 11 then
class == 10 then return "\124cFF00FF96" elseif return "\124cFFFF7D0A"
class == 2 then return "\124cFFF58CBA" elseif elseif class == 3 then
class == 5 then return "\124cFFFFFFFF" elseif return "\124cFFABD473"
class == 4 then return "\124cFFFFF569" elseif elseif class == 8 then
class == 7 then return "\124cFF0070DE" elseif return "\124cFF40C7EB"
class == 9 then return "\124cFF8787ED" elseif elseif class == 10 then
class == 1 then return "\124cFFC79C6E" else return "\124cFF00FF96"
return "\124cFFFFFFFF" end elseif class == 2 then
return "\124cFFF58CBA"
elseif class == 5 then
return "\124cFFFFFFFF"
elseif class == 4 then
return "\124cFFFFF569"
elseif class == 7 then
return "\124cFF0070DE"
elseif class == 9 then
return "\124cFF8787ED"
elseif class == 1 then
return "\124cFFC79C6E"
else
return "\124cFFFFFFFF"
end
end end
aura_env.classColor = function(name) aura_env.classColor = function(name)
local class = UnitClass(name) or "" local class = UnitClass(name) or ""
if class == "Death Knight" then return 0.77, 0.12, 0.23, 1 elseif if class == "Death Knight" then
class == "Demon Hunter" then return 0.64, 0.19, 0.79, 1 elseif return 0.77, 0.12, 0.23, 1
class == "Druid" then return 1, 0.49, 0.04, 1 elseif elseif class == "Demon Hunter" then
class == "Hunter" then return 0.67, 0.83, 0.45, 1 elseif return 0.64, 0.19, 0.79, 1
class == "Mage" then return 0.25, 0.78, 0.92, 1 elseif elseif class == "Druid" then
class == "Monk" then return 0, 1, 0.59, 1 elseif return 1, 0.49, 0.04, 1
class == "Paladin" then return 0.96, 0.55, 0.73, 1 elseif elseif class == "Hunter" then
class == "Priest" then return 1, 1, 1, 1 elseif return 0.67, 0.83, 0.45, 1
class == "Rogue" then return 1, 0.96, 0.41, 1 elseif elseif class == "Mage" then
class == "Shaman" then return 0, 0.44, 0.87, 1 elseif return 0.25, 0.78, 0.92, 1
class == "Warlock" then return 0.53, 0.53, 0.93, 1 elseif elseif class == "Monk" then
class == "Warrior" then return 0.78, 0.61, 0.43, 1 else return 0, 1, 0.59, 1
return 0, 0, 0, 0 end elseif class == "Paladin" then
return 0.96, 0.55, 0.73, 1
elseif class == "Priest" then
return 1, 1, 1, 1
elseif class == "Rogue" then
return 1, 0.96, 0.41, 1
elseif class == "Shaman" then
return 0, 0.44, 0.87, 1
elseif class == "Warlock" then
return 0.53, 0.53, 0.93, 1
elseif class == "Warrior" then
return 0.78, 0.61, 0.43, 1
else
return 0, 0, 0, 0
end
end end
aura_env.classColor = function(class) aura_env.classColor = function(class)
if class == 1 then return 0.78, 0.61, 0.43, 1 elseif if class == 1 then
class == 2 then return 0.96, 0.55, 0.73, 1 elseif return 0.78, 0.61, 0.43, 1
class == 3 then return 0.67, 0.83, 0.45, 1 elseif elseif class == 2 then
class == 4 then return 1, 0.96, 0.41, 1 elseif return 0.96, 0.55, 0.73, 1
class == 5 then return 1, 1, 1, 1 elseif elseif class == 3 then
class == 6 then return 0.77, 0.12, 0.23, 1 elseif return 0.67, 0.83, 0.45, 1
class == 7 then return 0, 0.44, 0.87, 1 elseif elseif class == 4 then
class == 8 then return 0.25, 0.78, 0.92, 1 elseif return 1, 0.96, 0.41, 1
class == 9 then return 0.53, 0.53, 0.93, 1 elseif elseif class == 5 then
class == 10 then return 0, 1, 0.59, 1 elseif return 1, 1, 1, 1
class == 11 then return 1, 0.49, 0.04, 1 elseif elseif class == 6 then
class == 12 then return 0.64, 0.19, 0.79, 1 else return 0.77, 0.12, 0.23, 1
return 1, 1, 1, 1 end elseif class == 7 then
return 0, 0.44, 0.87, 1
elseif class == 8 then
return 0.25, 0.78, 0.92, 1
elseif class == 9 then
return 0.53, 0.53, 0.93, 1
elseif class == 10 then
return 0, 1, 0.59, 1
elseif class == 11 then
return 1, 0.49, 0.04, 1
elseif class == 12 then
return 0.64, 0.19, 0.79, 1
else
return 1, 1, 1, 1
end
end end

View File

@@ -37,21 +37,20 @@ local function hexgrad(val, min, max)
end end
local function RGBtoHex(rgb) local function RGBtoHex(rgb)
local hexadecimal = 'FF' local hexadecimal = "FF"
for key, value in pairs(rgb) do for key, value in pairs(rgb) do
local hex = '' local hex = ""
while(value > 0)do while value > 0 do
local index = math.fmod(value, 16) + 1 local index = math.fmod(value, 16) + 1
value = math.floor(value / 16) value = math.floor(value / 16)
hex = string.sub('0123456789ABCDEF', index, index) .. hex hex = string.sub("0123456789ABCDEF", index, index) .. hex
end end
if(string.len(hex) == 0)then if string.len(hex) == 0 then
hex = '00' hex = "00"
elseif string.len(hex) == 1 then
elseif(string.len(hex) == 1)then hex = "0" .. hex
hex = '0' .. hex
end end
hexadecimal = hexadecimal .. hex hexadecimal = hexadecimal .. hex

View File

@@ -4,12 +4,8 @@ aura_env.getDate = function()
local month = date:match("(%d%d)") --(01)/07/19 14:36:42 local month = date:match("(%d%d)") --(01)/07/19 14:36:42
local day = date:match("%d%d%/(%d%d)") --01/(07)/19 14:36:42 local day = date:match("%d%d%/(%d%d)") --01/(07)/19 14:36:42
--Remove first place zeros --Remove first place zeros
if day:find("0") == 1 then if day:find("0") == 1 then day = day:gsub("0", "") end
day = day:gsub("0", "") if month:find("0") == 1 then month = month:gsub("0", "") end
end
if month:find("0") == 1 then
month = month:gsub("0", "")
end
local localdate = day .. "." .. month .. "." .. year local localdate = day .. "." .. month .. "." .. year
return localdate return localdate
end end
@@ -26,12 +22,8 @@ local function getDate()
local month = date:match("(%d%d)") --(01)/07/19 14:36:42 local month = date:match("(%d%d)") --(01)/07/19 14:36:42
local day = date:match("%d%d%/(%d%d)") --01/(07)/19 14:36:42 local day = date:match("%d%d%/(%d%d)") --01/(07)/19 14:36:42
--Remove first place zeros --Remove first place zeros
if day:find("0") == 1 then if day:find("0") == 1 then day = day:gsub("0", "") end
day = day:gsub("0", "") if month:find("0") == 1 then month = month:gsub("0", "") end
end
if month:find("0") == 1 then
month = month:gsub("0", "")
end
local localdate = day .. "." .. month .. "." .. year local localdate = day .. "." .. month .. "." .. year
return localdate return localdate
end end

View File

@@ -2,9 +2,7 @@ aura_env.auraID = function(spell)
for i = 1, 40 do for i = 1, 40 do
local name = UnitBuff("player", i) local name = UnitBuff("player", i)
if name then if name then
if name == spell then if name == spell then return i end
return i
end
else else
break break
end end

View File

@@ -5,9 +5,7 @@ local function formatTime(time)
res = res - 60 res = res - 60
end end
s = res s = res
if s < 10 then if s < 10 then s = string.format("0%d", s) end
s = string.format("0%d", s)
end
if type(s) ~= "string" then tostring(s) end if type(s) ~= "string" then tostring(s) end
return string.format("%d:%s", m, s) return string.format("%d:%s", m, s)
end end

View File

@@ -1,5 +1,3 @@
local function name(arguments) local function name(arguments) end
end
aura_env.name = function(arguments) aura_env.name = function(arguments) end
end

View File

@@ -1,4 +1,3 @@
for itemLink in msg:gmatch("|%x+|Hitem:.-|h.-|h|r") do for itemLink in msg:gmatch("|%x+|Hitem:.-|h.-|h|r") do
itemID = itemLink:match("item:(%d+):") itemID = itemLink:match("item:(%d+):")
icon = select(10, GetItemInfo(itemLink)) icon = select(10, GetItemInfo(itemLink))

View File

@@ -4,16 +4,14 @@ while true do
local spellName, spellSubName = GetSpellBookItemName(i, BOOKTYPE_SPELL) local spellName, spellSubName = GetSpellBookItemName(i, BOOKTYPE_SPELL)
local type, ID = GetSpellBookItemInfo(i, BOOKTYPE_SPELL) local type, ID = GetSpellBookItemInfo(i, BOOKTYPE_SPELL)
if not spellName then if not spellName then
do break end do
end
if spellName:match("Mastery:") then
break break
end end
if spellName ~= "Revive Battle Pets" and spellName ~= "Mobile Banking" then
if (GetSpellBaseCooldown(ID) or 0) > 20000 then
print(spellName, ID, GetSpellBaseCooldown(ID) / 1000)
end end
if spellName:match("Mastery:") then break end
if spellName ~= "Revive Battle Pets" and spellName ~= "Mobile Banking" then
if (GetSpellBaseCooldown(ID) or 0) > 20000 then print(spellName, ID, GetSpellBaseCooldown(ID) / 1000) end
end end
i = i + 1 i = i + 1
@@ -23,9 +21,7 @@ for row = 1, 7 do
for column = 1, 3 do for column = 1, 3 do
local ID = select(6, GetTalentInfo(row, column, 1)) local ID = select(6, GetTalentInfo(row, column, 1))
local spellName = select(2, GetTalentInfo(row, column, 1)) local spellName = select(2, GetTalentInfo(row, column, 1))
if GetSpellBaseCooldown(ID) > 20000 then if GetSpellBaseCooldown(ID) > 20000 then print(spellName, ID, GetSpellBaseCooldown(ID) / 1000) end
print(spellName, ID, GetSpellBaseCooldown(ID) / 1000)
end
end end
end end
for row = 1, 7 do for row = 1, 7 do
@@ -33,9 +29,7 @@ for row = 1, 7 do
local ID = select(6, GetPvpTalentInfo(row, column, 1)) local ID = select(6, GetPvpTalentInfo(row, column, 1))
if ID then if ID then
local spellName = select(2, GetPvpTalentInfo(row, column, 1)) local spellName = select(2, GetPvpTalentInfo(row, column, 1))
if GetSpellBaseCooldown(ID) > 20000 then if GetSpellBaseCooldown(ID) > 20000 then print(spellName, ID, GetSpellBaseCooldown(ID) / 1000) end
print(spellName, ID, GetSpellBaseCooldown(ID) / 1000)
end
end end
end end
end end

View File

@@ -1,3 +1 @@
hooksecurefunc( "JumpOrAscendStart", function() hooksecurefunc("JumpOrAscendStart", function() DEFAULT_CHAT_FRAME:AddMessage("Jump") end)
DEFAULT_CHAT_FRAME:AddMessage( "Jump" );
end );

View File

@@ -1,5 +1,5 @@
aura_env.round = function(var, n) aura_env.round = function(var, n)
if (n) then if n then
var = math.floor((var * 10 ^ n) + 0.5) / (10 ^ n) var = math.floor((var * 10 ^ n) + 0.5) / (10 ^ n)
else else
var = math.floor(var + 0.5) var = math.floor(var + 0.5)

View File

@@ -1,6 +1,6 @@
aura_env.shorten = function(val) aura_env.shorten = function(val)
local function round(var, n) local function round(var, n)
if (n) then if n then
var = math.floor((var * 10 ^ n) + 0.5) / (10 ^ n) var = math.floor((var * 10 ^ n) + 0.5) / (10 ^ n)
else else
var = math.floor(var + 0.5) var = math.floor(var + 0.5)

View File

@@ -2,9 +2,7 @@ aura_env.CUnitBuff = function(spell)
for i = 1, 40 do for i = 1, 40 do
local name = UnitBuff("player", i) local name = UnitBuff("player", i)
if name then if name then
if name == spell then if name == spell then return UnitBuff("player", i) end
return UnitBuff("player", i)
end
else else
break break
end end

View File

@@ -1,11 +1,8 @@
aura_env.UnitDebuffC = function(unit, spell) aura_env.UnitDebuffC = function(unit, spell)
for i = 1, 40 do for i = 1, 40 do
local name = UnitDebuff(unit, i) local name = UnitDebuff(unit, i)
if name then if name then
if name == spell then if name == spell then return UnitDebuff(unit, i) end
return UnitDebuff(unit, i)
end
else else
return nil return nil
end end
@@ -15,9 +12,7 @@ aura_env.UnitBuffC = function(unit, spell)
for i = 1, 40 do for i = 1, 40 do
local name = UnitBuff(unit, i) local name = UnitBuff(unit, i)
if name then if name then
if name == spell then if name == spell then return UnitBuff(unit, i) end
return UnitBuff(unit, i)
end
else else
return nil return nil
end end

File diff suppressed because it is too large Load Diff

View File

@@ -19,9 +19,12 @@ frenzyRegenFrame:SetSize(100, 26)
frenzyRegenFrame:ClearAllPoints() frenzyRegenFrame:ClearAllPoints()
frenzyRegenFrame:SetPoint("CENTER", UIParent) frenzyRegenFrame:SetPoint("CENTER", UIParent)
frenzyRegenFrame:SetBackdrop({ frenzyRegenFrame:SetBackdrop({
bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", tile = true, tileSize = 16, bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", edgeSize = 12, tile = true,
insets = {left = 3, right = 3, top = 3, bottom = 3, }, tileSize = 16,
edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
edgeSize = 12,
insets = { left = 3, right = 3, top = 3, bottom = 3 },
}) })
frenzyRegenFrame:SetBackdropColor(0, 0, 0, 0.4) frenzyRegenFrame:SetBackdropColor(0, 0, 0, 0.4)
frenzyRegenFrame:SetBackdropBorderColor(0, 0, 0, 1) frenzyRegenFrame:SetBackdropBorderColor(0, 0, 0, 1)
@@ -30,7 +33,7 @@ frenzyRegenFrame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
frenzyRegenFrame:RegisterEvent("ADDON_LOADED") frenzyRegenFrame:RegisterEvent("ADDON_LOADED")
frenzyRegenFrame:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED") frenzyRegenFrame:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
frenzyRegenFrame:RegisterEvent("UPDATE_SHAPESHIFT_FORM") frenzyRegenFrame:RegisterEvent("UPDATE_SHAPESHIFT_FORM")
frenzyRegenFrame:RegisterEvent("PLAYER_REGEN_DISABLED"); frenzyRegenFrame:RegisterEvent("PLAYER_REGEN_DISABLED")
frenzyRegenFrame:RegisterEvent("PLAYER_REGEN_ENABLED") frenzyRegenFrame:RegisterEvent("PLAYER_REGEN_ENABLED")
frenzyRegenFrame:RegisterEvent("ARTIFACT_UPDATE") frenzyRegenFrame:RegisterEvent("ARTIFACT_UPDATE")
frenzyRegenFrame:RegisterEvent("PET_BATTLE_CLOSE") frenzyRegenFrame:RegisterEvent("PET_BATTLE_CLOSE")
@@ -87,7 +90,8 @@ end
function frenzyRegenFrame:countHealing() function frenzyRegenFrame:countHealing()
maxHP = UnitHealthMax("player") maxHP = UnitHealthMax("player")
versatilityBonus = GetCombatRatingBonus(CR_VERSATILITY_DAMAGE_DONE) + GetVersatilityBonus(CR_VERSATILITY_DAMAGE_DONE) versatilityBonus = GetCombatRatingBonus(CR_VERSATILITY_DAMAGE_DONE)
+ GetVersatilityBonus(CR_VERSATILITY_DAMAGE_DONE)
expectedHealing = math.max(maxHP * 0.05, damageTP5S * 0.5) * (1 + versatilityBonus / 100) expectedHealing = math.max(maxHP * 0.05, damageTP5S * 0.5) * (1 + versatilityBonus / 100)
legendaryHealing = 0 legendaryHealing = 0
@@ -98,9 +102,7 @@ function frenzyRegenFrame:countHealing()
local t18set = { 124246, 124255, 124261, 124267, 124272 } local t18set = { 124246, 124255, 124261, 124267, 124272 }
local t18items = 0 local t18items = 0
for i = 1, 5, 1 do for i = 1, 5, 1 do
if IsEquippedItem(t18set[i]) then if IsEquippedItem(t18set[i]) then t18items = t18items + 1 end
t18items = t18items + 1
end
end end
isT18eq = t18items > 1 isT18eq = t18items > 1
@@ -123,9 +125,7 @@ function frenzyRegenFrame:countHealing()
idx = idx + 1 idx = idx + 1
until name == nil until name == nil
if IsEquippedItem(128821) then if IsEquippedItem(128821) then expectedHealing = expectedHealing * (1 + settingsFR.artifactBonus) end
expectedHealing = expectedHealing * (1 + settingsFR.artifactBonus)
end
ratioHP = (expectedHealing + legendaryHealing) / maxHP * 100 ratioHP = (expectedHealing + legendaryHealing) / maxHP * 100
anouncedHealing = format("Self healing %d%% over 3 sec", ratioHP) anouncedHealing = format("Self healing %d%% over 3 sec", ratioHP)
@@ -142,9 +142,8 @@ function frenzyRegenFrame:countHealing()
anouncedHealing = format("Self healing %s over 3 sec", self:getShortNumber(expectedHealing + legendaryHealing)) anouncedHealing = format("Self healing %s over 3 sec", self:getShortNumber(expectedHealing + legendaryHealing))
elseif settingsFR.displayFlag == 1 then elseif settingsFR.displayFlag == 1 then
frenzyRegenFrame.damageTakenBar.value:SetText(self:getShortNumber(expectedHealing / 6)) frenzyRegenFrame.damageTakenBar.value:SetText(self:getShortNumber(expectedHealing / 6))
else if settingsFR.displayFlag == 2 then else
frenzyRegenFrame.damageTakenBar.value:SetText(format("%d%%", ratioHP)) if settingsFR.displayFlag == 2 then frenzyRegenFrame.damageTakenBar.value:SetText(format("%d%%", ratioHP)) end
end
end end
if settingsFR.showValueOnlyFlag then if settingsFR.showValueOnlyFlag then
@@ -207,48 +206,20 @@ function frenzyRegenFrame:updateVisibility()
end end
function frenzyRegenFrame:initFlags() function frenzyRegenFrame:initFlags()
if settingsFR.displayFlag == nil then if settingsFR.displayFlag == nil then settingsFR.displayFlag = 0 end
settingsFR.displayFlag = 0; if settingsFR.greyOutFlag == nil then settingsFR.greyOutFlag = true end
end if settingsFR.movableFlag == nil then settingsFR.movableFlag = true end
if settingsFR.greyOutFlag == nil then if settingsFR.shortNumFlag == nil then settingsFR.shortNumFlag = true end
settingsFR.greyOutFlag = true; if settingsFR.hideOutOfCombatFlag == nil then settingsFR.hideOutOfCombatFlag = false end
end if settingsFR.hideOutOfBearFlag == nil then settingsFR.hideOutOfBearFlag = false end
if settingsFR.movableFlag == nil then if settingsFR.legendaryFlag == nil then settingsFR.legendaryFlag = false end
settingsFR.movableFlag = true; if settingsFR.artifactBonus == nil then settingsFR.artifactBonus = 0 end
end if settingsFR.transparencyFlag == nil then settingsFR.transparencyFlag = 1 end
if settingsFR.shortNumFlag == nil then if settingsFR.ignoreMouseFlag == nil then settingsFR.ignoreMouseFlag = false end
settingsFR.shortNumFlag = true; if settingsFR.announceFlag == nil then settingsFR.announceFlag = false end
end if settingsFR.announceChannel == nil then settingsFR.announceChannel = "SAY" end
if settingsFR.hideOutOfCombatFlag == nil then if settingsFR.statusTypeFlag == nil then settingsFR.statusTypeFlag = 0 end
settingsFR.hideOutOfCombatFlag = false; if settingsFR.showValueOnlyFlag == nil then settingsFR.showValueOnlyFlag = false end
end
if settingsFR.hideOutOfBearFlag == nil then
settingsFR.hideOutOfBearFlag = false;
end
if settingsFR.legendaryFlag == nil then
settingsFR.legendaryFlag = false;
end
if settingsFR.artifactBonus == nil then
settingsFR.artifactBonus = 0;
end
if settingsFR.transparencyFlag == nil then
settingsFR.transparencyFlag = 1;
end
if settingsFR.ignoreMouseFlag == nil then
settingsFR.ignoreMouseFlag = false;
end
if settingsFR.announceFlag == nil then
settingsFR.announceFlag = false;
end
if settingsFR.announceChannel == nil then
settingsFR.announceChannel = "SAY";
end
if settingsFR.statusTypeFlag == nil then
settingsFR.statusTypeFlag = 0;
end
if settingsFR.showValueOnlyFlag == nil then
settingsFR.showValueOnlyFlag = false;
end
end end
function frenzyRegenFrame:updateArtifactBonus() function frenzyRegenFrame:updateArtifactBonus()
@@ -265,8 +236,7 @@ function frenzyRegenFrame:updateArtifactBonus()
end end
end end
frenzyRegenFrame:SetScript("OnEvent", frenzyRegenFrame:SetScript("OnEvent", function(self, event, ...)
function(self, event, ...)
if event == "ADDON_LOADED" then if event == "ADDON_LOADED" then
playerGUID = UnitGUID("player") playerGUID = UnitGUID("player")
if settingsFR.XPos then if settingsFR.XPos then
@@ -274,12 +244,9 @@ frenzyRegenFrame:SetScript("OnEvent",
frenzyRegenFrame:SetPoint("BOTTOMLEFT", settingsFR.XPos, settingsFR.YPos) frenzyRegenFrame:SetPoint("BOTTOMLEFT", settingsFR.XPos, settingsFR.YPos)
end end
frenzyRegenFrame:initFlags() frenzyRegenFrame:initFlags()
if not settingsFR.movableFlag then if not settingsFR.movableFlag then frenzyRegenFrame:SetMovable(false) end
frenzyRegenFrame:SetMovable(false)
end
frenzyRegenFrame:updateVisibility() frenzyRegenFrame:updateVisibility()
elseif self:IsShown() and event == "COMBAT_LOG_EVENT_UNFILTERED" then elseif self:IsShown() and event == "COMBAT_LOG_EVENT_UNFILTERED" then
local _, eventType, _, sourceGUID, _, _, _, destGUID = ... local _, eventType, _, sourceGUID, _, _, _, destGUID = ...
if settingsFR.announceFlag and sourceGUID == playerGUID and eventType == "SPELL_CAST_SUCCESS" then if settingsFR.announceFlag and sourceGUID == playerGUID and eventType == "SPELL_CAST_SUCCESS" then
local spellId = select(12, ...) local spellId = select(12, ...)
@@ -291,20 +258,26 @@ frenzyRegenFrame:SetScript("OnEvent",
eventIndex = eventIndex + 1 eventIndex = eventIndex + 1
if eventType == "SWING_DAMAGE" then if eventType == "SWING_DAMAGE" then
local _, _, _, _, _, _, _, _, _, _, _, amount, _, _, _, _, absorbed = ... local _, _, _, _, _, _, _, _, _, _, _, amount, _, _, _, _, absorbed = ...
if absorbed == nil then if absorbed == nil then absorbed = 0 end
absorbed = 0;
end
damageTable[eventIndex] = { time(), amount + absorbed } damageTable[eventIndex] = { time(), amount + absorbed }
elseif eventType == "SPELL_DAMAGE" or eventType == "SPELL_PERIODIC_DAMAGE" or eventType == "RANGE_DAMAGE" then elseif
eventType == "SPELL_DAMAGE"
or eventType == "SPELL_PERIODIC_DAMAGE"
or eventType == "RANGE_DAMAGE"
then
local _, _, _, _, _, _, _, _, _, _, _, _, _, _, amount, _, _, _, _, absorbed = ... local _, _, _, _, _, _, _, _, _, _, _, _, _, _, amount, _, _, _, _, absorbed = ...
if absorbed == nil then if absorbed == nil then absorbed = 0 end
absorbed = 0;
end
damageTable[eventIndex] = { time(), amount + absorbed } damageTable[eventIndex] = { time(), amount + absorbed }
end end
end end
elseif event == "ACTIVE_TALENT_GROUP_CHANGED" or event == "UPDATE_SHAPESHIFT_FORM" or event == "PLAYER_REGEN_DISABLED" or event == "PLAYER_REGEN_ENABLED" or elseif
event == "PET_BATTLE_CLOSE" or event == "PET_BATTLE_OPENING_START" then event == "ACTIVE_TALENT_GROUP_CHANGED"
or event == "UPDATE_SHAPESHIFT_FORM"
or event == "PLAYER_REGEN_DISABLED"
or event == "PLAYER_REGEN_ENABLED"
or event == "PET_BATTLE_CLOSE"
or event == "PET_BATTLE_OPENING_START"
then
frenzyRegenFrame:updateVisibility() frenzyRegenFrame:updateVisibility()
elseif event == "ARTIFACT_UPDATE" then elseif event == "ARTIFACT_UPDATE" then
frenzyRegenFrame:updateArtifactBonus() frenzyRegenFrame:updateArtifactBonus()
@@ -373,14 +346,20 @@ frenzyRegenFrame:SetScript("OnEvent",
elseif level == 2 then elseif level == 2 then
if UIDROPDOWNMENU_MENU_VALUE == "position_submenu" then if UIDROPDOWNMENU_MENU_VALUE == "position_submenu" then
info.text = "Block position" info.text = "Block position"
info.func = function() frenzyRegenFrame:SetMovable(not frenzyRegenFrame:IsMovable()) settingsFR.movableFlag = frenzyRegenFrame:IsMovable() end info.func = function()
frenzyRegenFrame:SetMovable(not frenzyRegenFrame:IsMovable())
settingsFR.movableFlag = frenzyRegenFrame:IsMovable()
end
info.checked = function() return not frenzyRegenFrame:IsMovable() end info.checked = function() return not frenzyRegenFrame:IsMovable() end
info.isNotRadio = true info.isNotRadio = true
UIDropDownMenu_AddButton(info, level) UIDropDownMenu_AddButton(info, level)
end end
if UIDROPDOWNMENU_MENU_VALUE == "position_submenu" then if UIDROPDOWNMENU_MENU_VALUE == "position_submenu" then
info.text = "Ignore clicks in combat" info.text = "Ignore clicks in combat"
info.func = function() settingsFR.ignoreMouseFlag = not settingsFR.ignoreMouseFlag frenzyRegenFrame:updateVisibility() end info.func = function()
settingsFR.ignoreMouseFlag = not settingsFR.ignoreMouseFlag
frenzyRegenFrame:updateVisibility()
end
info.checked = function() return settingsFR.ignoreMouseFlag end info.checked = function() return settingsFR.ignoreMouseFlag end
UIDropDownMenu_AddButton(info, level) UIDropDownMenu_AddButton(info, level)
end end
@@ -448,14 +427,22 @@ frenzyRegenFrame:SetScript("OnEvent",
info = UIDropDownMenu_CreateInfo() info = UIDropDownMenu_CreateInfo()
info.notCheckable = false info.notCheckable = false
info.text = "Hide when not in Bear form" info.text = "Hide when not in Bear form"
info.func = function() settingsFR.hideOutOfBearFlag = not settingsFR.hideOutOfBearFlag frenzyRegenFrame:updateVisibility() print("To turn off this setting type '/frshow bear'") end info.func = function()
settingsFR.hideOutOfBearFlag = not settingsFR.hideOutOfBearFlag
frenzyRegenFrame:updateVisibility()
print("To turn off this setting type '/frshow bear'")
end
info.checked = function() return settingsFR.hideOutOfBearFlag end info.checked = function() return settingsFR.hideOutOfBearFlag end
info.isNotRadio = true info.isNotRadio = true
UIDropDownMenu_AddButton(info, level) UIDropDownMenu_AddButton(info, level)
end end
if UIDROPDOWNMENU_MENU_VALUE == "position_submenu" then if UIDROPDOWNMENU_MENU_VALUE == "position_submenu" then
info.text = "Hide when out of combat" info.text = "Hide when out of combat"
info.func = function() settingsFR.hideOutOfCombatFlag = not settingsFR.hideOutOfCombatFlag frenzyRegenFrame:updateVisibility() print("To turn off this setting type '/frshow combat'") end info.func = function()
settingsFR.hideOutOfCombatFlag = not settingsFR.hideOutOfCombatFlag
frenzyRegenFrame:updateVisibility()
print("To turn off this setting type '/frshow combat'")
end
info.checked = function() return settingsFR.hideOutOfCombatFlag end info.checked = function() return settingsFR.hideOutOfCombatFlag end
UIDropDownMenu_AddButton(info, level) UIDropDownMenu_AddButton(info, level)
end end
@@ -525,25 +512,37 @@ frenzyRegenFrame:SetScript("OnEvent",
end end
if UIDROPDOWNMENU_MENU_VALUE == "position_submenu4" then if UIDROPDOWNMENU_MENU_VALUE == "position_submenu4" then
info.text = "/Say" info.text = "/Say"
info.func = function() settingsFR.announceChannel = "SAY" settingsFR.announceFlag = true end info.func = function()
settingsFR.announceChannel = "SAY"
settingsFR.announceFlag = true
end
info.checked = function() return settingsFR.announceFlag and settingsFR.announceChannel == "SAY" end info.checked = function() return settingsFR.announceFlag and settingsFR.announceChannel == "SAY" end
UIDropDownMenu_AddButton(info, level) UIDropDownMenu_AddButton(info, level)
end end
if UIDROPDOWNMENU_MENU_VALUE == "position_submenu4" then if UIDROPDOWNMENU_MENU_VALUE == "position_submenu4" then
info.text = "/Yell" info.text = "/Yell"
info.func = function() settingsFR.announceChannel = "YELL" settingsFR.announceFlag = true end info.func = function()
settingsFR.announceChannel = "YELL"
settingsFR.announceFlag = true
end
info.checked = function() return settingsFR.announceFlag and settingsFR.announceChannel == "YELL" end info.checked = function() return settingsFR.announceFlag and settingsFR.announceChannel == "YELL" end
UIDropDownMenu_AddButton(info, level) UIDropDownMenu_AddButton(info, level)
end end
if UIDROPDOWNMENU_MENU_VALUE == "position_submenu4" then if UIDROPDOWNMENU_MENU_VALUE == "position_submenu4" then
info.text = "/Party" info.text = "/Party"
info.func = function() settingsFR.announceChannel = "PARTY" settingsFR.announceFlag = true end info.func = function()
settingsFR.announceChannel = "PARTY"
settingsFR.announceFlag = true
end
info.checked = function() return settingsFR.announceFlag and settingsFR.announceChannel == "PARTY" end info.checked = function() return settingsFR.announceFlag and settingsFR.announceChannel == "PARTY" end
UIDropDownMenu_AddButton(info, level) UIDropDownMenu_AddButton(info, level)
end end
if UIDROPDOWNMENU_MENU_VALUE == "position_submenu4" then if UIDROPDOWNMENU_MENU_VALUE == "position_submenu4" then
info.text = "/Raid" info.text = "/Raid"
info.func = function() settingsFR.announceChannel = "RAID" settingsFR.announceFlag = true end info.func = function()
settingsFR.announceChannel = "RAID"
settingsFR.announceFlag = true
end
info.checked = function() return settingsFR.announceFlag and settingsFR.announceChannel == "RAID" end info.checked = function() return settingsFR.announceFlag and settingsFR.announceChannel == "RAID" end
UIDropDownMenu_AddButton(info, level) UIDropDownMenu_AddButton(info, level)
end end
@@ -551,12 +550,10 @@ frenzyRegenFrame:SetScript("OnEvent",
end) end)
frenzyRegenFrame:SetScript("OnMouseDown", function(self, button) frenzyRegenFrame:SetScript("OnMouseDown", function(self, button)
if button == "RightButton" then if button == "RightButton" then ToggleDropDownMenu(1, nil, dropDown, "cursor", 3, -3) end
ToggleDropDownMenu(1, nil, dropDown, "cursor", 3, -3)
end
end) end)
SLASH_FRENZYREGEN1 = "/frshow"; SLASH_FRENZYREGEN1 = "/frshow"
function SlashCmdList.FRENZYREGEN(msg, editbox) function SlashCmdList.FRENZYREGEN(msg, editbox)
if msg == "bear" then if msg == "bear" then
settingsFR.hideOutOfBearFlag = not settingsFR.hideOutOfBearFlag settingsFR.hideOutOfBearFlag = not settingsFR.hideOutOfBearFlag
@@ -565,4 +562,3 @@ frenzyRegenFrame:SetScript("OnEvent",
end end
frenzyRegenFrame:updateVisibility() frenzyRegenFrame:updateVisibility()
end end