beta

2020-07-31 19:46:21 +03:00
parent 549b04ce78
commit 02c047002d
49 changed files with 850 additions and 451 deletions
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local WeakAuras = WeakAuras
 local L = WeakAuras.L
@@ -57,6 +57,7 @@ Returns the potential conditions for a trigger
 ]]--

 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 -- Lua APIs
 local tinsert, wipe = table.insert, wipe
@@ -57,6 +57,7 @@ GetTriggerConditions(data, triggernum)
 Returns the potential conditions for a trigger
 ]]--
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 -- Lua APIs
 local tinsert, wipe = table.insert, wipe
@@ -56,6 +56,7 @@ GetTriggerConditions(data, triggernum)
 Returns potential conditions that this trigger provides.
 ]]--
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 -- Lua APIs
 local tinsert, tconcat, wipe = table.insert, table.concat, wipe
@@ -1,6 +1,5 @@
-
-
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local WeakAuras = WeakAuras

@@ -25,16 +25,13 @@ function WeakAuras.IsCorrectVersion()
 end

 WeakAuras.prettyPrint = function(msg)
-  print(WeakAuras.printPrefix .. msg)
+  print("|cff9900ffWeakAuras:|r " .. msg)
 end

 if versionString ~= versionStringFromToc and versionStringFromToc ~= "Dev" then
  WeakAuras.prettyPrint("You need to restart your game client to complete the WeakAuras update!")
 end

-WeakAuras.PowerAurasPath = "Interface\\Addons\\WeakAuras\\PowerAurasMedia\\Auras\\"
-WeakAuras.PowerAurasSoundPath = "Interface\\Addons\\WeakAuras\\PowerAurasMedia\\Sounds\\"
-
 -- Force enable WeakAurasCompanion and Archive because some addon managers interfere with it
 EnableAddOn("WeakAurasCompanion")
 EnableAddOn("WeakAurasArchive")
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local WeakAuras = WeakAuras
 local L = WeakAuras.L
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 -- Lua APIs
 local tinsert, tsort = table.insert, table.sort
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L;
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local WeakAuras = WeakAuras
 local SharedMedia = LibStub("LibSharedMedia-3.0")
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");

@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L
@@ -6,7 +7,7 @@ local MSQ, MSQ_Version = LibStub("Masque", true);
 if MSQ then
  if MSQ_Version <= 80100 then
    MSQ = nil
-    print(print(WeakAuras.printPrefix .. L["Please upgrade your Masque version"]))
+   WeakAuras.prettyPrint(L["Please upgrade your Masque version"])
  else
    MSQ:AddType("WA_Aura", {"Icon", "Cooldown"})
  end
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L;
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local L = WeakAuras.L;

@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local WeakAuras = WeakAuras;
 local L = WeakAuras.L;
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L;
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local L = WeakAuras.L;

@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L;
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L;
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");
 local LCG = LibStub("LibCustomGlow-1.0")
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L;
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L;
@@ -12,6 +13,14 @@ local default = function(parentType)
    automatic_length = true,
    tick_thickness = 2,
    tick_length = 30,
+    use_texture = false,
+    tick_texture = [[Interface\CastingBar\UI-CastingBar-Spark]],
+    tick_blend_mode = "ADD",
+    tick_desaturate = false,
+    tick_rotation = 0,
+    tick_xOffset = 0,
+    tick_yOffset = 0,
+    tick_mirror = false,
  }
 end

@@ -61,6 +70,26 @@ local properties = {
    bigStep = 1,
    default = 30,
  },
+  tick_desaturate = {
+    display = L["Desaturate"],
+    setter = "SetTickDesaturated",
+    type = "bool",
+    default = true,
+  },
+  tick_rotation = {
+    display = L["Rotation"],
+    setter = "SetTickRotation",
+    type = "number",
+    min = 0,
+    max = 360,
+    default = 0,
+  },
+  tick_mirror = {
+    display = L["Mirror"],
+    setter = "SetTickMirror",
+    type = "bool",
+    default = true,
+  },
 }

 local auraBarAnchor = {
@@ -145,7 +174,12 @@ local funcs = {
  end,
  SetTickColor = function(self, r, g, b, a)
    self.tick_color[1], self.tick_color[2], self.tick_color[3], self.tick_color[4] = r, g, b, a or 1
-    self.texture:SetTexture(r, g, b, a or 1)
+    if self.use_texture then
+      self.texture:SetVertexColor(r, g, b, a or 1)
+      self:UpdateTickDesaturated()
+    else
+      self.texture:SetTexture(r, g, b, a or 1)
+    end
  end,
  SetTickPlacementMode = function(self, placement_mode)
    if self.tick_placement_mode ~= placement_mode then
@@ -232,7 +266,7 @@ local funcs = {
    end
    local side = inverse and auraBarAnchorInverse or auraBarAnchor
    self:ClearAllPoints()
-    self:SetPoint("CENTER", self.parent.bar, side[self.orientation], offsetx, offsety)
+    self:SetPoint("CENTER", self.parent.bar, side[self.orientation], offsetx + self.tick_xOffset, offsety + self.tick_yOffset)
  end,
  SetAutomaticLength = function(self, automatic_length)
    if self.automatic_length ~= automatic_length then
@@ -265,7 +299,52 @@ local funcs = {
    else
      self:SetHeight(length)
    end
-  end
+  end,
+  SetTickDesaturated = function(self, desaturate)
+    if self.use_texture and self.tick_desaturate ~= desaturate then
+      self.tick_desaturate = desaturate
+      self:UpdateTickDesaturated()
+    end
+  end,
+  UpdateTickDesaturated = function(self)
+    self.texture:SetDesaturated(self.tick_desaturate)
+  end,
+  SetTickRotation = function(self, degrees)
+    if self.tick_rotation ~= degrees then
+      self.tick_rotation = degrees
+      self:UpdateTickRotation()
+    end
+  end,
+  UpdateTickRotation = function(self)
+      local rad = math.rad(self.tick_rotation)
+      self.texture:SetRotation(rad)
+  end,
+  SetTickMirror = function(self, mirror)
+    if self.mirror ~= mirror then
+      self.mirror = mirror
+      self:UpdateTickMirror()
+    end
+  end,
+  UpdateTickMirror = function(self)
+    if self.mirror then
+      self.texture:SetTexCoord(0,  1,  1,  1,  0,  0,  1,  0)
+    else
+      self.texture:SetTexCoord(0,  0,  1,  0,  0,  1,  1,  1)
+    end
+  end,
+  SetTickBlendMode = function(self, mode)
+    if self.tick_blend_mode ~= mode then
+      self.tick_blend_mode = mode
+      self:UpdateTickBlendMode()
+    end
+  end,
+  UpdateTickBlendMode = function(self)
+    if self.use_texture then
+      self.texture:SetBlendMode(self.tick_blend_mode)
+    else
+      self.texture:SetBlendMode("BLEND")
+    end
+  end,
 }

 local function modify(parent, region, parentData, data, first)
@@ -290,13 +369,26 @@ local function modify(parent, region, parentData, data, first)
  region.automatic_length = data.automatic_length
  region.tick_thickness = data.tick_thickness
  region.tick_length = data.tick_length
+  region.use_texture = data.use_texture
+  region.tick_texture = data.tick_texture
+
+  region.tick_xOffset = data.tick_xOffset
+  region.tick_yOffset = data.tick_yOffset

  for k, v in pairs(funcs) do
    region[k] = v
  end

+  if data.use_texture then
+    region.texture:SetTexture(data.tick_texture)
+  end
+
  region:SetVisible(data.tick_visible)
  region:SetTickColor(unpack(data.tick_color))
+  region:SetTickDesaturated(data.tick_desaturate)
+  region:SetTickBlendMode(data.tick_blend_mode)
+  region:SetTickRotation(data.tick_rotation)
+  region:SetTickMirror(data.tick_mirror)

  region:UpdateTickSize()

@@ -13,7 +13,7 @@ Converts the display id to a formatted table
 SerializeTable(data)
 Converts the table data to a formatted table

-ShowDisplayTooltip(data, children, icon, icons, import, compressed, alterdesc)
+ShowDisplayTooltip(data, children, icon, icons, import, compressed)
 Shows a tooltip frame for an aura, which allows for importing if import is true

 Import(str, [target])
@@ -22,6 +22,7 @@ If target is installed data, or is a uid which points to installed data, then th

 ]]--
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 -- Lua APIs
 local tinsert = table.insert
@@ -366,7 +367,7 @@ local function importPendingData()
    regionOptions[thumbnailAnchor.currentThumbnailType].releaseThumbnail(thumbnailAnchor.currentThumbnail)
    thumbnailAnchor.currentThumbnail = nil
  end
-  if imports and WeakAuras.LoadOptions() then
+  if imports and Private.LoadOptions() then
    WeakAuras.ShowOptions()
  else
    return
@@ -1421,7 +1422,7 @@ function WeakAuras.Update(data, diff)
 end


-function WeakAuras.ShowDisplayTooltip(data, children, matchInfo, icon, icons, import, compressed, alterdesc)
+function WeakAuras.ShowDisplayTooltip(data, children, matchInfo, icon, icons, import, compressed)
  -- since we have new data, wipe the old pending data
  wipe(pendingData)

@@ -1610,105 +1611,6 @@ function WeakAuras.ShowDisplayTooltip(data, children, matchInfo, icon, icons, im

  end

-  if alterdesc then -- TODO: simplify this. The frame doesn't need to be a field of ItemRefTooltip, for one.
-    if not(ItemRefTooltip.WeakAuras_Desc_Box) then
-      ItemRefTooltip.WeakAuras_Desc_Box = CreateFrame("frame", nil, ItemRefTooltip);
-    end
-    local descboxframe = ItemRefTooltip.WeakAuras_Desc_Box;
-    descboxframe:SetBackdrop({
-      bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
-      edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-      edgeSize = 16,
-      insets = {
-        left = 4,
-        right = 3,
-        top = 4,
-        bottom = 3
-      }
-    });
-    descboxframe:SetBackdropColor(0, 0, 0);
-    descboxframe:SetBackdropBorderColor(0.4, 0.4, 0.4);
-    if (alterdesc == "desc") then
-      descboxframe:SetHeight(80);
-    else
-      descboxframe:SetHeight(20);
-    end
-    descboxframe:SetWidth(260);
-    descboxframe:SetPoint("TOP", ItemRefTooltip, "BOTTOM");
-    descboxframe:Show();
-
-    local descbox = descboxframe.descbox;
-    if not(descbox) then
-      descbox = CreateFrame("editbox", nil, descboxframe);
-      descboxframe.descbox = descbox;
-    end
-    descbox:SetPoint("BOTTOMLEFT", descboxframe, "BOTTOMLEFT", 8, 8);
-    descbox:SetPoint("TOPRIGHT", descboxframe, "TOPRIGHT", -8, -8);
-    descbox:SetFont(STANDARD_TEXT_FONT, 12);
-    descbox:EnableMouse(true);
-    descbox:SetAutoFocus(false);
-    descbox:SetCountInvisibleLetters(false);
-    descbox:SetMultiLine(alterdesc == "desc");
-
-    if (alterdesc == "url") then
-      if (not descbox.label) then
-        local label = descbox:CreateFontString(nil, "BACKGROUND", "GameFontHighlightSmall");
-        label:SetPoint("TOPLEFT", descboxframe, "BOTTOMLEFT", 8, 0);
-        label:SetText(L["Press Ctrl+C to copy"]);
-        descbox.label = label;
-      end
-      descbox.label:Show();
-    else
-      if (descbox.label) then
-        descbox.label:Hide();
-      end
-    end
-
-    local text = data[alterdesc] and data[alterdesc] ~= "" and data[alterdesc] or "";
-    descbox:SetText(text);
-
-    descbox:SetScript("OnEscapePressed", function()
-      descbox:ClearFocus();
-      if (alterdesc == "url") then
-        return;
-      end
-      if(data.desc and data.desc ~= "") then
-        descbox:SetText(data.desc);
-      else
-        descbox:SetText("");
-      end
-    end);
-    descbox:SetScript("OnEnterPressed", function()
-      descbox:ClearFocus();
-      if (alterdesc == "url") then
-        return;
-      end
-      if(descbox:GetText() ~= "") then
-        data.desc = descbox:GetText();
-      else
-        data.desc = nil;
-      end
-      WeakAuras.ShowDisplayTooltip(data, children, nil, nil, nil, import, nil, "desc");
-      if(WeakAuras.GetDisplayButton) then
-        local button = WeakAuras.GetDisplayButton(data.id);
-        if(button) then
-          button:SetNormalTooltip();
-        end
-      end
-    end);
-    if (alterdesc == "url") then
-      descbox:SetScript("OnChar", function() descbox:SetText(text); descbox:HighlightText(); end);
-      descbox:SetScript("OnMouseUp", function() descbox:HighlightText(); end);
-    else
-      descbox:SetScript("OnChar", nil);
-      descbox:SetScript("OnMouseUp", nil);
-    end
-
-    descbox:Show();
-  elseif ItemRefTooltip.WeakAuras_Desc_Box then
-    ItemRefTooltip.WeakAuras_Desc_Box:Hide()
-  end
-
  if not IsAddOnLoaded('WeakAurasOptions') then
    LoadAddOn('WeakAurasOptions')
  end
@@ -1741,13 +1643,6 @@ function WeakAuras.ShowDisplayTooltip(data, children, matchInfo, icon, icons, im
  end
  WeakAuras.GetData = RegularGetData or WeakAuras.GetData
  ShowTooltip(tooltip, linesFromTop, matchInfo and matchInfo.activeCategories)
-
-  if alterdesc then
-    ItemRefTooltip.WeakAuras_Desc_Box.descbox:SetFocus();
-    if (alterdesc == "url") then
-      ItemRefTooltip.WeakAuras_Desc_Box.descbox:HighlightText();
-    end
-  end
 end

 function WeakAuras.Import(inData, target)
@@ -1,4 +1,5 @@
 if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...

 local WeakAuras = WeakAuras;
 local L = WeakAuras.L;
@@ -241,7 +242,6 @@ WeakAuras.format_types = {
        type = "range",
        name = L["Max Char "],
        width = WeakAuras.normalWidth,
-        hidden = hidden,
        min = 1,
        max = 20,
        hidden = hidden,
@@ -363,7 +363,6 @@ WeakAuras.format_types = {
        type = "range",
        name = L["Max Char "],
        width = WeakAuras.normalWidth,
-        hidden = hidden,
        min = 1,
        max = 20,
        hidden = hidden,
@@ -1371,163 +1370,162 @@ WeakAuras.texture_types = {
  }
 }

-if(WeakAuras.PowerAurasPath ~= "") then
-  WeakAuras.texture_types["PowerAuras Heads-Up"] = {
-    [WeakAuras.PowerAurasPath.."Aura1"] = "Runed Text",
-    [WeakAuras.PowerAurasPath.."Aura2"] = "Runed Text On Ring",
-    [WeakAuras.PowerAurasPath.."Aura3"] = "Power Waves",
-    [WeakAuras.PowerAurasPath.."Aura4"] = "Majesty",
-    [WeakAuras.PowerAurasPath.."Aura5"] = "Runed Ends",
-    [WeakAuras.PowerAurasPath.."Aura6"] = "Extra Majesty",
-    [WeakAuras.PowerAurasPath.."Aura7"] = "Triangular Highlights",
-    [WeakAuras.PowerAurasPath.."Aura11"] = "Oblong Highlights",
-    [WeakAuras.PowerAurasPath.."Aura16"] = "Thin Crescents",
-    [WeakAuras.PowerAurasPath.."Aura17"] = "Crescent Highlights",
-    [WeakAuras.PowerAurasPath.."Aura18"] = "Dense Runed Text",
-    [WeakAuras.PowerAurasPath.."Aura23"] = "Runed Spiked Ring",
-    [WeakAuras.PowerAurasPath.."Aura24"] = "Smoke",
-    [WeakAuras.PowerAurasPath.."Aura28"] = "Flourished Text",
-    [WeakAuras.PowerAurasPath.."Aura33"] = "Droplet Highlights"
-  }
-  WeakAuras.texture_types["PowerAuras Icons"] = {
-    [WeakAuras.PowerAurasPath.."Aura8"] = "Rune",
-    [WeakAuras.PowerAurasPath.."Aura9"] = "Stylized Ghost",
-    [WeakAuras.PowerAurasPath.."Aura10"] = "Skull and Crossbones",
-    [WeakAuras.PowerAurasPath.."Aura12"] = "Snowflake",
-    [WeakAuras.PowerAurasPath.."Aura13"] = "Flame",
-    [WeakAuras.PowerAurasPath.."Aura14"] = "Holy Rune",
-    [WeakAuras.PowerAurasPath.."Aura15"] = "Zig-Zag Exclamation Point",
-    [WeakAuras.PowerAurasPath.."Aura19"] = "Crossed Swords",
-    [WeakAuras.PowerAurasPath.."Aura21"] = "Shield",
-    [WeakAuras.PowerAurasPath.."Aura22"] = "Glow",
-    [WeakAuras.PowerAurasPath.."Aura25"] = "Cross",
-    [WeakAuras.PowerAurasPath.."Aura26"] = "Droplet",
-    [WeakAuras.PowerAurasPath.."Aura27"] = "Alert",
-    [WeakAuras.PowerAurasPath.."Aura29"] = "Paw",
-    [WeakAuras.PowerAurasPath.."Aura30"] = "Bull",
-    --   [WeakAuras.PowerAurasPath.."Aura31"] = "Heiroglyphics Horizontal",
-    [WeakAuras.PowerAurasPath.."Aura32"] = "Heiroglyphics",
-    [WeakAuras.PowerAurasPath.."Aura34"] = "Circled Arrow",
-    [WeakAuras.PowerAurasPath.."Aura35"] = "Short Sword",
-    --   [WeakAuras.PowerAurasPath.."Aura36"] = "Short Sword Horizontal",
-    [WeakAuras.PowerAurasPath.."Aura45"] = "Circular Glow",
-    [WeakAuras.PowerAurasPath.."Aura48"] = "Totem",
-    [WeakAuras.PowerAurasPath.."Aura49"] = "Dragon Blade",
-    [WeakAuras.PowerAurasPath.."Aura50"] = "Ornate Design",
-    [WeakAuras.PowerAurasPath.."Aura51"] = "Inverted Holy Rune",
-    [WeakAuras.PowerAurasPath.."Aura52"] = "Stylized Skull",
-    [WeakAuras.PowerAurasPath.."Aura53"] = "Exclamation Point",
-    [WeakAuras.PowerAurasPath.."Aura54"] = "Nonagon",
-    [WeakAuras.PowerAurasPath.."Aura68"] = "Wings",
-    [WeakAuras.PowerAurasPath.."Aura69"] = "Rectangle",
-    [WeakAuras.PowerAurasPath.."Aura70"] = "Low Mana",
-    [WeakAuras.PowerAurasPath.."Aura71"] = "Ghostly Eye",
-    [WeakAuras.PowerAurasPath.."Aura72"] = "Circle",
-    [WeakAuras.PowerAurasPath.."Aura73"] = "Ring",
-    [WeakAuras.PowerAurasPath.."Aura74"] = "Square",
-    [WeakAuras.PowerAurasPath.."Aura75"] = "Square Brackets",
-    [WeakAuras.PowerAurasPath.."Aura76"] = "Bob-omb",
-    [WeakAuras.PowerAurasPath.."Aura77"] = "Goldfish",
-    [WeakAuras.PowerAurasPath.."Aura78"] = "Check",
-    [WeakAuras.PowerAurasPath.."Aura79"] = "Ghostly Face",
-    [WeakAuras.PowerAurasPath.."Aura84"] = "Overlapping Boxes",
-    --   [WeakAuras.PowerAurasPath.."Aura85"] = "Overlapping Boxes 45°",
-    --   [WeakAuras.PowerAurasPath.."Aura86"] = "Overlapping Boxes 270°",
-    [WeakAuras.PowerAurasPath.."Aura87"] = "Fairy",
-    [WeakAuras.PowerAurasPath.."Aura88"] = "Comet",
-    [WeakAuras.PowerAurasPath.."Aura95"] = "Dual Spiral",
-    [WeakAuras.PowerAurasPath.."Aura96"] = "Japanese Character",
-    [WeakAuras.PowerAurasPath.."Aura97"] = "Japanese Character",
-    [WeakAuras.PowerAurasPath.."Aura98"] = "Japanese Character",
-    [WeakAuras.PowerAurasPath.."Aura99"] = "Japanese Character",
-    [WeakAuras.PowerAurasPath.."Aura100"] = "Japanese Character",
-    [WeakAuras.PowerAurasPath.."Aura101"] = "Ball of Flame",
-    [WeakAuras.PowerAurasPath.."Aura102"] = "Zig-Zag",
-    [WeakAuras.PowerAurasPath.."Aura103"] = "Thorny Ring",
-    [WeakAuras.PowerAurasPath.."Aura110"] = "Hunter's Mark",
-    --   [WeakAuras.PowerAurasPath.."Aura111"] = "Hunter's Mark Horizontal",
-    [WeakAuras.PowerAurasPath.."Aura112"] = "Kaleidoscope",
-    [WeakAuras.PowerAurasPath.."Aura113"] = "Jesus Face",
-    [WeakAuras.PowerAurasPath.."Aura114"] = "Green Mushrrom",
-    [WeakAuras.PowerAurasPath.."Aura115"] = "Red Mushroom",
-    [WeakAuras.PowerAurasPath.."Aura116"] = "Fire Flower",
-    [WeakAuras.PowerAurasPath.."Aura117"] = "Radioactive",
-    [WeakAuras.PowerAurasPath.."Aura118"] = "X",
-    [WeakAuras.PowerAurasPath.."Aura119"] = "Flower",
-    [WeakAuras.PowerAurasPath.."Aura120"] = "Petal",
-    [WeakAuras.PowerAurasPath.."Aura130"] = "Shoop Da Woop",
-    [WeakAuras.PowerAurasPath.."Aura131"] = "8-Bit Symbol",
-    [WeakAuras.PowerAurasPath.."Aura132"] = "Cartoon Skull",
-    [WeakAuras.PowerAurasPath.."Aura138"] = "Stop",
-    [WeakAuras.PowerAurasPath.."Aura139"] = "Thumbs Up",
-    [WeakAuras.PowerAurasPath.."Aura140"] = "Palette",
-    [WeakAuras.PowerAurasPath.."Aura141"] = "Blue Ring",
-    [WeakAuras.PowerAurasPath.."Aura142"] = "Ornate Ring",
-    [WeakAuras.PowerAurasPath.."Aura143"] = "Ghostly Skull"
-  }
-  WeakAuras.texture_types["PowerAuras Separated"] = {
-    [WeakAuras.PowerAurasPath.."Aura46"] = "8-Part Ring 1",
-    [WeakAuras.PowerAurasPath.."Aura47"] = "8-Part Ring 2",
-    [WeakAuras.PowerAurasPath.."Aura55"] = "Skull on Gear 1",
-    [WeakAuras.PowerAurasPath.."Aura56"] = "Skull on Gear 2",
-    [WeakAuras.PowerAurasPath.."Aura57"] = "Skull on Gear 3",
-    [WeakAuras.PowerAurasPath.."Aura58"] = "Skull on Gear 4",
-    [WeakAuras.PowerAurasPath.."Aura59"] = "Rune Ring Full",
-    [WeakAuras.PowerAurasPath.."Aura60"] = "Rune Ring Empty",
-    [WeakAuras.PowerAurasPath.."Aura61"] = "Rune Ring Left",
-    [WeakAuras.PowerAurasPath.."Aura62"] = "Rune Ring Right",
-    [WeakAuras.PowerAurasPath.."Aura63"] = "Spiked Rune Ring Full",
-    [WeakAuras.PowerAurasPath.."Aura64"] = "Spiked Rune Ring Empty",
-    [WeakAuras.PowerAurasPath.."Aura65"] = "Spiked Rune Ring Left",
-    [WeakAuras.PowerAurasPath.."Aura66"] = "Spiked Rune Ring Bottom",
-    [WeakAuras.PowerAurasPath.."Aura67"] = "Spiked Rune Ring Right",
-    [WeakAuras.PowerAurasPath.."Aura80"] = "Spiked Helm Background",
-    [WeakAuras.PowerAurasPath.."Aura81"] = "Spiked Helm Full",
-    [WeakAuras.PowerAurasPath.."Aura82"] = "Spiked Helm Bottom",
-    [WeakAuras.PowerAurasPath.."Aura83"] = "Spiked Helm Top",
-    [WeakAuras.PowerAurasPath.."Aura89"] = "5-Part Ring 1",
-    [WeakAuras.PowerAurasPath.."Aura90"] = "5-Part Ring 2",
-    [WeakAuras.PowerAurasPath.."Aura91"] = "5-Part Ring 3",
-    [WeakAuras.PowerAurasPath.."Aura92"] = "5-Part Ring 4",
-    [WeakAuras.PowerAurasPath.."Aura93"] = "5-Part Ring 5",
-    [WeakAuras.PowerAurasPath.."Aura94"] = "5-Part Ring Full",
-    [WeakAuras.PowerAurasPath.."Aura104"] = "Shield Center",
-    [WeakAuras.PowerAurasPath.."Aura105"] = "Shield Full",
-    [WeakAuras.PowerAurasPath.."Aura106"] = "Shield Top Right",
-    [WeakAuras.PowerAurasPath.."Aura107"] = "Shiled Top Left",
-    [WeakAuras.PowerAurasPath.."Aura108"] = "Shield Bottom Right",
-    [WeakAuras.PowerAurasPath.."Aura109"] = "Shield Bottom Left",
-    [WeakAuras.PowerAurasPath.."Aura121"] = "Vine Top Right Leaf",
-    [WeakAuras.PowerAurasPath.."Aura122"] = "Vine Left Leaf",
-    [WeakAuras.PowerAurasPath.."Aura123"] = "Vine Bottom Right Leaf",
-    [WeakAuras.PowerAurasPath.."Aura124"] = "Vine Stem",
-    [WeakAuras.PowerAurasPath.."Aura125"] = "Vine Thorns",
-    [WeakAuras.PowerAurasPath.."Aura126"] = "3-Part Circle 1",
-    [WeakAuras.PowerAurasPath.."Aura127"] = "3-Part Circle 2",
-    [WeakAuras.PowerAurasPath.."Aura128"] = "3-Part Circle 3",
-    [WeakAuras.PowerAurasPath.."Aura129"] = "3-Part Circle Full",
-    [WeakAuras.PowerAurasPath.."Aura133"] = "Sliced Orb 1",
-    [WeakAuras.PowerAurasPath.."Aura134"] = "Sliced Orb 2",
-    [WeakAuras.PowerAurasPath.."Aura135"] = "Sliced Orb 3",
-    [WeakAuras.PowerAurasPath.."Aura136"] = "Sliced Orb 4",
-    [WeakAuras.PowerAurasPath.."Aura137"] = "Sliced Orb 5",
-    [WeakAuras.PowerAurasPath.."Aura144"] = "Taijitu Bottom",
-    [WeakAuras.PowerAurasPath.."Aura145"] = "Taijitu Top"
-  }
-  WeakAuras.texture_types["PowerAuras Words"] = {
-    [WeakAuras.PowerAurasPath.."Aura20"] = "Power",
-    [WeakAuras.PowerAurasPath.."Aura37"] = "Slow",
-    [WeakAuras.PowerAurasPath.."Aura38"] = "Stun",
-    [WeakAuras.PowerAurasPath.."Aura39"] = "Silence",
-    [WeakAuras.PowerAurasPath.."Aura40"] = "Root",
-    [WeakAuras.PowerAurasPath.."Aura41"] = "Disorient",
-    [WeakAuras.PowerAurasPath.."Aura42"] = "Dispell",
-    [WeakAuras.PowerAurasPath.."Aura43"] = "Danger",
-    [WeakAuras.PowerAurasPath.."Aura44"] = "Buff",
-    [WeakAuras.PowerAurasPath.."Aura44"] = "Buff",
-    ["Interface\\AddOns\\WeakAuras\\Media\\Textures\\interrupt"] = "Interrupt"
-  }
-end
+local PowerAurasPath = "Interface\\Addons\\WeakAuras\\PowerAurasMedia\\Auras\\"
+WeakAuras.texture_types["PowerAuras Heads-Up"] = {
+  [PowerAurasPath.."Aura1"] = "Runed Text",
+  [PowerAurasPath.."Aura2"] = "Runed Text On Ring",
+  [PowerAurasPath.."Aura3"] = "Power Waves",
+  [PowerAurasPath.."Aura4"] = "Majesty",
+  [PowerAurasPath.."Aura5"] = "Runed Ends",
+  [PowerAurasPath.."Aura6"] = "Extra Majesty",
+  [PowerAurasPath.."Aura7"] = "Triangular Highlights",
+  [PowerAurasPath.."Aura11"] = "Oblong Highlights",
+  [PowerAurasPath.."Aura16"] = "Thin Crescents",
+  [PowerAurasPath.."Aura17"] = "Crescent Highlights",
+  [PowerAurasPath.."Aura18"] = "Dense Runed Text",
+  [PowerAurasPath.."Aura23"] = "Runed Spiked Ring",
+  [PowerAurasPath.."Aura24"] = "Smoke",
+  [PowerAurasPath.."Aura28"] = "Flourished Text",
+  [PowerAurasPath.."Aura33"] = "Droplet Highlights"
+}
+WeakAuras.texture_types["PowerAuras Icons"] = {
+  [PowerAurasPath.."Aura8"] = "Rune",
+  [PowerAurasPath.."Aura9"] = "Stylized Ghost",
+  [PowerAurasPath.."Aura10"] = "Skull and Crossbones",
+  [PowerAurasPath.."Aura12"] = "Snowflake",
+  [PowerAurasPath.."Aura13"] = "Flame",
+  [PowerAurasPath.."Aura14"] = "Holy Rune",
+  [PowerAurasPath.."Aura15"] = "Zig-Zag Exclamation Point",
+  [PowerAurasPath.."Aura19"] = "Crossed Swords",
+  [PowerAurasPath.."Aura21"] = "Shield",
+  [PowerAurasPath.."Aura22"] = "Glow",
+  [PowerAurasPath.."Aura25"] = "Cross",
+  [PowerAurasPath.."Aura26"] = "Droplet",
+  [PowerAurasPath.."Aura27"] = "Alert",
+  [PowerAurasPath.."Aura29"] = "Paw",
+  [PowerAurasPath.."Aura30"] = "Bull",
+  --   [PowerAurasPath.."Aura31"] = "Heiroglyphics Horizontal",
+  [PowerAurasPath.."Aura32"] = "Heiroglyphics",
+  [PowerAurasPath.."Aura34"] = "Circled Arrow",
+  [PowerAurasPath.."Aura35"] = "Short Sword",
+  --   [PowerAurasPath.."Aura36"] = "Short Sword Horizontal",
+  [PowerAurasPath.."Aura45"] = "Circular Glow",
+  [PowerAurasPath.."Aura48"] = "Totem",
+  [PowerAurasPath.."Aura49"] = "Dragon Blade",
+  [PowerAurasPath.."Aura50"] = "Ornate Design",
+  [PowerAurasPath.."Aura51"] = "Inverted Holy Rune",
+  [PowerAurasPath.."Aura52"] = "Stylized Skull",
+  [PowerAurasPath.."Aura53"] = "Exclamation Point",
+  [PowerAurasPath.."Aura54"] = "Nonagon",
+  [PowerAurasPath.."Aura68"] = "Wings",
+  [PowerAurasPath.."Aura69"] = "Rectangle",
+  [PowerAurasPath.."Aura70"] = "Low Mana",
+  [PowerAurasPath.."Aura71"] = "Ghostly Eye",
+  [PowerAurasPath.."Aura72"] = "Circle",
+  [PowerAurasPath.."Aura73"] = "Ring",
+  [PowerAurasPath.."Aura74"] = "Square",
+  [PowerAurasPath.."Aura75"] = "Square Brackets",
+  [PowerAurasPath.."Aura76"] = "Bob-omb",
+  [PowerAurasPath.."Aura77"] = "Goldfish",
+  [PowerAurasPath.."Aura78"] = "Check",
+  [PowerAurasPath.."Aura79"] = "Ghostly Face",
+  [PowerAurasPath.."Aura84"] = "Overlapping Boxes",
+  --   [PowerAurasPath.."Aura85"] = "Overlapping Boxes 45°",
+  --   [PowerAurasPath.."Aura86"] = "Overlapping Boxes 270°",
+  [PowerAurasPath.."Aura87"] = "Fairy",
+  [PowerAurasPath.."Aura88"] = "Comet",
+  [PowerAurasPath.."Aura95"] = "Dual Spiral",
+  [PowerAurasPath.."Aura96"] = "Japanese Character",
+  [PowerAurasPath.."Aura97"] = "Japanese Character",
+  [PowerAurasPath.."Aura98"] = "Japanese Character",
+  [PowerAurasPath.."Aura99"] = "Japanese Character",
+  [PowerAurasPath.."Aura100"] = "Japanese Character",
+  [PowerAurasPath.."Aura101"] = "Ball of Flame",
+  [PowerAurasPath.."Aura102"] = "Zig-Zag",
+  [PowerAurasPath.."Aura103"] = "Thorny Ring",
+  [PowerAurasPath.."Aura110"] = "Hunter's Mark",
+  --   [PowerAurasPath.."Aura111"] = "Hunter's Mark Horizontal",
+  [PowerAurasPath.."Aura112"] = "Kaleidoscope",
+  [PowerAurasPath.."Aura113"] = "Jesus Face",
+  [PowerAurasPath.."Aura114"] = "Green Mushrrom",
+  [PowerAurasPath.."Aura115"] = "Red Mushroom",
+  [PowerAurasPath.."Aura116"] = "Fire Flower",
+  [PowerAurasPath.."Aura117"] = "Radioactive",
+  [PowerAurasPath.."Aura118"] = "X",
+  [PowerAurasPath.."Aura119"] = "Flower",
+  [PowerAurasPath.."Aura120"] = "Petal",
+  [PowerAurasPath.."Aura130"] = "Shoop Da Woop",
+  [PowerAurasPath.."Aura131"] = "8-Bit Symbol",
+  [PowerAurasPath.."Aura132"] = "Cartoon Skull",
+  [PowerAurasPath.."Aura138"] = "Stop",
+  [PowerAurasPath.."Aura139"] = "Thumbs Up",
+  [PowerAurasPath.."Aura140"] = "Palette",
+  [PowerAurasPath.."Aura141"] = "Blue Ring",
+  [PowerAurasPath.."Aura142"] = "Ornate Ring",
+  [PowerAurasPath.."Aura143"] = "Ghostly Skull"
+}
+WeakAuras.texture_types["PowerAuras Separated"] = {
+  [PowerAurasPath.."Aura46"] = "8-Part Ring 1",
+  [PowerAurasPath.."Aura47"] = "8-Part Ring 2",
+  [PowerAurasPath.."Aura55"] = "Skull on Gear 1",
+  [PowerAurasPath.."Aura56"] = "Skull on Gear 2",
+  [PowerAurasPath.."Aura57"] = "Skull on Gear 3",
+  [PowerAurasPath.."Aura58"] = "Skull on Gear 4",
+  [PowerAurasPath.."Aura59"] = "Rune Ring Full",
+  [PowerAurasPath.."Aura60"] = "Rune Ring Empty",
+  [PowerAurasPath.."Aura61"] = "Rune Ring Left",
+  [PowerAurasPath.."Aura62"] = "Rune Ring Right",
+  [PowerAurasPath.."Aura63"] = "Spiked Rune Ring Full",
+  [PowerAurasPath.."Aura64"] = "Spiked Rune Ring Empty",
+  [PowerAurasPath.."Aura65"] = "Spiked Rune Ring Left",
+  [PowerAurasPath.."Aura66"] = "Spiked Rune Ring Bottom",
+  [PowerAurasPath.."Aura67"] = "Spiked Rune Ring Right",
+  [PowerAurasPath.."Aura80"] = "Spiked Helm Background",
+  [PowerAurasPath.."Aura81"] = "Spiked Helm Full",
+  [PowerAurasPath.."Aura82"] = "Spiked Helm Bottom",
+  [PowerAurasPath.."Aura83"] = "Spiked Helm Top",
+  [PowerAurasPath.."Aura89"] = "5-Part Ring 1",
+  [PowerAurasPath.."Aura90"] = "5-Part Ring 2",
+  [PowerAurasPath.."Aura91"] = "5-Part Ring 3",
+  [PowerAurasPath.."Aura92"] = "5-Part Ring 4",
+  [PowerAurasPath.."Aura93"] = "5-Part Ring 5",
+  [PowerAurasPath.."Aura94"] = "5-Part Ring Full",
+  [PowerAurasPath.."Aura104"] = "Shield Center",
+  [PowerAurasPath.."Aura105"] = "Shield Full",
+  [PowerAurasPath.."Aura106"] = "Shield Top Right",
+  [PowerAurasPath.."Aura107"] = "Shiled Top Left",
+  [PowerAurasPath.."Aura108"] = "Shield Bottom Right",
+  [PowerAurasPath.."Aura109"] = "Shield Bottom Left",
+  [PowerAurasPath.."Aura121"] = "Vine Top Right Leaf",
+  [PowerAurasPath.."Aura122"] = "Vine Left Leaf",
+  [PowerAurasPath.."Aura123"] = "Vine Bottom Right Leaf",
+  [PowerAurasPath.."Aura124"] = "Vine Stem",
+  [PowerAurasPath.."Aura125"] = "Vine Thorns",
+  [PowerAurasPath.."Aura126"] = "3-Part Circle 1",
+  [PowerAurasPath.."Aura127"] = "3-Part Circle 2",
+  [PowerAurasPath.."Aura128"] = "3-Part Circle 3",
+  [PowerAurasPath.."Aura129"] = "3-Part Circle Full",
+  [PowerAurasPath.."Aura133"] = "Sliced Orb 1",
+  [PowerAurasPath.."Aura134"] = "Sliced Orb 2",
+  [PowerAurasPath.."Aura135"] = "Sliced Orb 3",
+  [PowerAurasPath.."Aura136"] = "Sliced Orb 4",
+  [PowerAurasPath.."Aura137"] = "Sliced Orb 5",
+  [PowerAurasPath.."Aura144"] = "Taijitu Bottom",
+  [PowerAurasPath.."Aura145"] = "Taijitu Top"
+}
+WeakAuras.texture_types["PowerAuras Words"] = {
+  [PowerAurasPath.."Aura20"] = "Power",
+  [PowerAurasPath.."Aura37"] = "Slow",
+  [PowerAurasPath.."Aura38"] = "Stun",
+  [PowerAurasPath.."Aura39"] = "Silence",
+  [PowerAurasPath.."Aura40"] = "Root",
+  [PowerAurasPath.."Aura41"] = "Disorient",
+  [PowerAurasPath.."Aura42"] = "Dispell",
+  [PowerAurasPath.."Aura43"] = "Danger",
+  [PowerAurasPath.."Aura44"] = "Buff",
+  [PowerAurasPath.."Aura44"] = "Buff",
+  ["Interface\\AddOns\\WeakAuras\\Media\\Textures\\interrupt"] = "Interrupt"
+}

 WeakAuras.operator_types = {
  ["=="] = "=",
@@ -1909,50 +1907,49 @@ LSM:Register("sound", "Voice: Taunt", "Interface\\AddOns\\WeakAuras\\Media\\Soun
 LSM:Register("sound", "Voice: Triangle", "Interface\\AddOns\\WeakAuras\\Media\\Sounds\\Triangle.ogg")


-if(WeakAuras.PowerAurasSoundPath ~= "") then
-  LSM:Register("sound", "Aggro", WeakAuras.PowerAurasSoundPath.."aggro.ogg")
-  LSM:Register("sound", "Arrow Swoosh", WeakAuras.PowerAurasSoundPath.."Arrow_swoosh.ogg")
-  LSM:Register("sound", "Bam", WeakAuras.PowerAurasSoundPath.."bam.ogg")
-  LSM:Register("sound", "Polar Bear", WeakAuras.PowerAurasSoundPath.."bear_polar.ogg")
-  LSM:Register("sound", "Big Kiss", WeakAuras.PowerAurasSoundPath.."bigkiss.ogg")
-  LSM:Register("sound", "Bite", WeakAuras.PowerAurasSoundPath.."BITE.ogg")
-  LSM:Register("sound", "Burp", WeakAuras.PowerAurasSoundPath.."burp4.ogg")
-  LSM:Register("sound", "Cat", WeakAuras.PowerAurasSoundPath.."cat2.ogg")
-  LSM:Register("sound", "Chant Major 2nd", WeakAuras.PowerAurasSoundPath.."chant2.ogg")
-  LSM:Register("sound", "Chant Minor 3rd", WeakAuras.PowerAurasSoundPath.."chant4.ogg")
-  LSM:Register("sound", "Chimes", WeakAuras.PowerAurasSoundPath.."chimes.ogg")
-  LSM:Register("sound", "Cookie Monster", WeakAuras.PowerAurasSoundPath.."cookie.ogg")
-  LSM:Register("sound", "Electrical Spark", WeakAuras.PowerAurasSoundPath.."ESPARK1.ogg")
-  LSM:Register("sound", "Fireball", WeakAuras.PowerAurasSoundPath.."Fireball.ogg")
-  LSM:Register("sound", "Gasp", WeakAuras.PowerAurasSoundPath.."Gasp.ogg")
-  LSM:Register("sound", "Heartbeat", WeakAuras.PowerAurasSoundPath.."heartbeat.ogg")
-  LSM:Register("sound", "Hiccup", WeakAuras.PowerAurasSoundPath.."hic3.ogg")
-  LSM:Register("sound", "Huh?", WeakAuras.PowerAurasSoundPath.."huh_1.ogg")
-  LSM:Register("sound", "Hurricane", WeakAuras.PowerAurasSoundPath.."hurricane.ogg")
-  LSM:Register("sound", "Hyena", WeakAuras.PowerAurasSoundPath.."hyena.ogg")
-  LSM:Register("sound", "Kaching", WeakAuras.PowerAurasSoundPath.."kaching.ogg")
-  LSM:Register("sound", "Moan", WeakAuras.PowerAurasSoundPath.."moan.ogg")
-  LSM:Register("sound", "Panther", WeakAuras.PowerAurasSoundPath.."panther1.ogg")
-  LSM:Register("sound", "Phone", WeakAuras.PowerAurasSoundPath.."phone.ogg")
-  LSM:Register("sound", "Punch", WeakAuras.PowerAurasSoundPath.."PUNCH.ogg")
-  LSM:Register("sound", "Rain", WeakAuras.PowerAurasSoundPath.."rainroof.ogg")
-  LSM:Register("sound", "Rocket", WeakAuras.PowerAurasSoundPath.."rocket.ogg")
-  LSM:Register("sound", "Ship's Whistle", WeakAuras.PowerAurasSoundPath.."shipswhistle.ogg")
-  LSM:Register("sound", "Gunshot", WeakAuras.PowerAurasSoundPath.."shot.ogg")
-  LSM:Register("sound", "Snake Attack", WeakAuras.PowerAurasSoundPath.."snakeatt.ogg")
-  LSM:Register("sound", "Sneeze", WeakAuras.PowerAurasSoundPath.."sneeze.ogg")
-  LSM:Register("sound", "Sonar", WeakAuras.PowerAurasSoundPath.."sonar.ogg")
-  LSM:Register("sound", "Splash", WeakAuras.PowerAurasSoundPath.."splash.ogg")
-  LSM:Register("sound", "Squeaky Toy", WeakAuras.PowerAurasSoundPath.."Squeakypig.ogg")
-  LSM:Register("sound", "Sword Ring", WeakAuras.PowerAurasSoundPath.."swordecho.ogg")
-  LSM:Register("sound", "Throwing Knife", WeakAuras.PowerAurasSoundPath.."throwknife.ogg")
-  LSM:Register("sound", "Thunder", WeakAuras.PowerAurasSoundPath.."thunder.ogg")
-  LSM:Register("sound", "Wicked Male Laugh", WeakAuras.PowerAurasSoundPath.."wickedmalelaugh1.ogg")
-  LSM:Register("sound", "Wilhelm Scream", WeakAuras.PowerAurasSoundPath.."wilhelm.ogg")
-  LSM:Register("sound", "Wicked Female Laugh", WeakAuras.PowerAurasSoundPath.."wlaugh.ogg")
-  LSM:Register("sound", "Wolf Howl", WeakAuras.PowerAurasSoundPath.."wolf5.ogg")
-  LSM:Register("sound", "Yeehaw", WeakAuras.PowerAurasSoundPath.."yeehaw.ogg")
-end
+local PowerAurasSoundPath = "Interface\\Addons\\WeakAuras\\PowerAurasMedia\\Sounds\\"
+LSM:Register("sound", "Aggro", PowerAurasSoundPath.."aggro.ogg")
+LSM:Register("sound", "Arrow Swoosh", PowerAurasSoundPath.."Arrow_swoosh.ogg")
+LSM:Register("sound", "Bam", PowerAurasSoundPath.."bam.ogg")
+LSM:Register("sound", "Polar Bear", PowerAurasSoundPath.."bear_polar.ogg")
+LSM:Register("sound", "Big Kiss", PowerAurasSoundPath.."bigkiss.ogg")
+LSM:Register("sound", "Bite", PowerAurasSoundPath.."BITE.ogg")
+LSM:Register("sound", "Burp", PowerAurasSoundPath.."burp4.ogg")
+LSM:Register("sound", "Cat", PowerAurasSoundPath.."cat2.ogg")
+LSM:Register("sound", "Chant Major 2nd", PowerAurasSoundPath.."chant2.ogg")
+LSM:Register("sound", "Chant Minor 3rd", PowerAurasSoundPath.."chant4.ogg")
+LSM:Register("sound", "Chimes", PowerAurasSoundPath.."chimes.ogg")
+LSM:Register("sound", "Cookie Monster", PowerAurasSoundPath.."cookie.ogg")
+LSM:Register("sound", "Electrical Spark", PowerAurasSoundPath.."ESPARK1.ogg")
+LSM:Register("sound", "Fireball", PowerAurasSoundPath.."Fireball.ogg")
+LSM:Register("sound", "Gasp", PowerAurasSoundPath.."Gasp.ogg")
+LSM:Register("sound", "Heartbeat", PowerAurasSoundPath.."heartbeat.ogg")
+LSM:Register("sound", "Hiccup", PowerAurasSoundPath.."hic3.ogg")
+LSM:Register("sound", "Huh?", PowerAurasSoundPath.."huh_1.ogg")
+LSM:Register("sound", "Hurricane", PowerAurasSoundPath.."hurricane.ogg")
+LSM:Register("sound", "Hyena", PowerAurasSoundPath.."hyena.ogg")
+LSM:Register("sound", "Kaching", PowerAurasSoundPath.."kaching.ogg")
+LSM:Register("sound", "Moan", PowerAurasSoundPath.."moan.ogg")
+LSM:Register("sound", "Panther", PowerAurasSoundPath.."panther1.ogg")
+LSM:Register("sound", "Phone", PowerAurasSoundPath.."phone.ogg")
+LSM:Register("sound", "Punch", PowerAurasSoundPath.."PUNCH.ogg")
+LSM:Register("sound", "Rain", PowerAurasSoundPath.."rainroof.ogg")
+LSM:Register("sound", "Rocket", PowerAurasSoundPath.."rocket.ogg")
+LSM:Register("sound", "Ship's Whistle", PowerAurasSoundPath.."shipswhistle.ogg")
+LSM:Register("sound", "Gunshot", PowerAurasSoundPath.."shot.ogg")
+LSM:Register("sound", "Snake Attack", PowerAurasSoundPath.."snakeatt.ogg")
+LSM:Register("sound", "Sneeze", PowerAurasSoundPath.."sneeze.ogg")
+LSM:Register("sound", "Sonar", PowerAurasSoundPath.."sonar.ogg")
+LSM:Register("sound", "Splash", PowerAurasSoundPath.."splash.ogg")
+LSM:Register("sound", "Squeaky Toy", PowerAurasSoundPath.."Squeakypig.ogg")
+LSM:Register("sound", "Sword Ring", PowerAurasSoundPath.."swordecho.ogg")
+LSM:Register("sound", "Throwing Knife", PowerAurasSoundPath.."throwknife.ogg")
+LSM:Register("sound", "Thunder", PowerAurasSoundPath.."thunder.ogg")
+LSM:Register("sound", "Wicked Male Laugh", PowerAurasSoundPath.."wickedmalelaugh1.ogg")
+LSM:Register("sound", "Wilhelm Scream", PowerAurasSoundPath.."wilhelm.ogg")
+LSM:Register("sound", "Wicked Female Laugh", PowerAurasSoundPath.."wlaugh.ogg")
+LSM:Register("sound", "Wolf Howl", PowerAurasSoundPath.."wolf5.ogg")
+LSM:Register("sound", "Yeehaw", PowerAurasSoundPath.."yeehaw.ogg")

 WeakAuras.sound_types = {
  [" custom"] = " " .. L["Custom"],
@@ -1,3 +1,5 @@
+local AddonName, Private = ...
+
 local internalVersion = 33;

 -- Lua APIs
@@ -59,7 +61,7 @@ function WeakAuras.InternalVersion()
  return internalVersion;
 end

-function WeakAuras.LoadOptions(msg)
+function Private.LoadOptions(msg)
  if not(IsAddOnLoaded("WeakAurasOptions")) then
    if not WeakAuras.IsLoginFinished() then
      prettyPrint(WeakAuras.LoginMessage())
@@ -74,7 +76,7 @@ function WeakAuras.LoadOptions(msg)
      local loaded, reason = LoadAddOn("WeakAurasOptions");
      if not(loaded) then
        reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
-        print(WeakAuras.printPrefix .. "Options could not be loaded, the addon is " .. reason);
+        WeakAuras.prettyPrint("Options could not be loaded, the addon is " .. reason);
        return false;
      end
    end
@@ -85,12 +87,12 @@ end
 function WeakAuras.OpenOptions(msg)
  if WeakAuras.NeedToRepairDatabase() then
    StaticPopup_Show("WEAKAURAS_CONFIRM_REPAIR", nil, nil, {reason = "downgrade"})
-  elseif (WeakAuras.IsLoginFinished() and WeakAuras.LoadOptions(msg)) then
+  elseif (WeakAuras.IsLoginFinished() and Private.LoadOptions(msg)) then
    WeakAuras.ToggleOptions(msg);
  end
 end

-function WeakAuras.PrintHelp()
+function Private.PrintHelp()
  print(L["Usage:"])
  print(L["/wa help - Show this message"])
  print(L["/wa minimap - Toggle the minimap icon"])
@@ -120,9 +122,9 @@ function SlashCmdList.WEAKAURAS(input)
  elseif msg == "pcancel" then
    WeakAuras.CancelScheduledProfile()
  elseif msg == "minimap" then
-    WeakAuras.ToggleMinimap();
+    Private.ToggleMinimap();
  elseif msg == "help" then
-    WeakAuras.PrintHelp();
+    Private.PrintHelp();
  elseif msg == "repair" then
    StaticPopup_Show("WEAKAURAS_CONFIRM_REPAIR", nil, nil, {reason = "user"})
  else
@@ -143,7 +145,7 @@ function WeakAuras.ApplyToDataOrChildData(data, func, ...)
  end
 end

-function WeakAuras.ToggleMinimap()
+function Private.ToggleMinimap()
  WeakAurasSaved.minimap.hide = not WeakAurasSaved.minimap.hide
  if WeakAurasSaved.minimap.hide then
    LDBIcon:Hide("WeakAuras");
@@ -169,10 +171,6 @@ local registeredFromAddons;
 WeakAuras.addons = {};
 local addons = WeakAuras.addons;

-- A list of tutorials, filled in by the WeakAuras_Tutorials addon by calling RegisterTutorial
-WeakAuras.tutorials = {};
-local tutorials = WeakAuras.tutorials;
-
 -- used if an addon tries to register a display under an id that the user already has a display with that id
 WeakAuras.collisions = {};
 local collisions = WeakAuras.collisions;
@@ -908,6 +906,19 @@ local function CreateTestForCondition(uid, input, allConditionsTemplate, usedSta
        check = string.format("state and WeakAuras.CallCustomConditionTest(%q, %s, state[%s], %s, %s, %s)",
                              uid, testFunctionNumber, trigger, valueString, (opString or "nil"), preambleString or "nil");
      end
+    elseif (cType == "customcheck") then
+      if value then
+        local customCheck = WeakAuras.LoadFunction("return " .. value, "custom check")
+        if customCheck then
+          WeakAuras.conditionHelpers[uid] = WeakAuras.conditionHelpers[uid] or {}
+          WeakAuras.conditionHelpers[uid].customTestFunctions = WeakAuras.conditionHelpers[uid].customTestFunctions or {}
+          tinsert(WeakAuras.conditionHelpers[uid].customTestFunctions, customCheck);
+          local testFunctionNumber = #(WeakAuras.conditionHelpers[uid].customTestFunctions);
+
+          check = string.format("state and WeakAuras.CallCustomConditionTest(%q, %s, state)",
+                                uid, testFunctionNumber, trigger);
+        end
+      end
    elseif (cType == "number" and op) then
      local v = tonumber(value)
      if (v) then
@@ -1212,6 +1223,10 @@ local globalConditions =
      state.attackabletarget = UnitCanAttack("player", "target") == 1 and true or false;
    end
  },
+  ["customcheck"] = {
+    display = L["Custom Check"],
+    type = "customcheck"
+  }
 }

 function WeakAuras.GetGlobalConditions()
@@ -1362,6 +1377,16 @@ local function EvaluateCheckForRegisterForGlobalConditions(id, check, allConditi
        EvaluateCheckForRegisterForGlobalConditions(id, subcheck, allConditionsTemplate, register);
      end
    end
+  elseif trigger == -1 and variable == "customcheck" then
+    if check.op then
+      for event in string.gmatch(check.op, "[%w_]+") do
+        if (not dynamicConditions[event]) then
+          register[event] = true;
+          dynamicConditions[event] = {};
+        end
+        dynamicConditions[event][id] = true;
+      end
+    end
  elseif (trigger and variable) then
    local conditionTemplate = allConditionsTemplate[trigger] and allConditionsTemplate[trigger][variable];
    if (conditionTemplate and conditionTemplate.events) then
@@ -1414,7 +1439,7 @@ function WeakAuras.RegisterForGlobalConditions(id)
        dynamicConditionsFrame.onUpdate = true;
      end
    else
-      dynamicConditionsFrame:RegisterEvent(event);
+      pcall(dynamicConditionsFrame.RegisterEvent, dynamicConditionsFrame, event);
    end
  end
 end
@@ -1530,7 +1555,7 @@ Broker_WeakAuras = LDB:NewDataObject("WeakAuras", {
        WeakAuras.OpenOptions();
      end
    elseif(button == 'MiddleButton') then
-      WeakAuras.ToggleMinimap();
+      Private.ToggleMinimap();
    else
      WeakAuras.RealTimeProfilingWindow:Toggle()
    end
@@ -2433,6 +2458,9 @@ function WeakAuras.Rename(data, newid)
  WeakAuras.ProfileRenameAura(oldid, newid);

  WeakAuras.RenameCollapsedData(oldid, newid)
+
+  -- This should not be necessary
+  WeakAuras.Add(data)
 end

 function WeakAuras.Convert(data, newType)
@@ -5664,17 +5692,6 @@ function WeakAuras.ProfileDisplays(all)
  end
 end

-function WeakAuras.RegisterTutorial(name, displayName, description, icon, steps, order)
-  tutorials[name] = {
-    name = name,
-    displayName = displayName,
-    description = description,
-    icon = icon,
-    steps = steps,
-    order = order
-  };
-end
-
 function WeakAuras.ValueFromPath(data, path)
  if not data then
    return nil
@@ -5847,7 +5864,7 @@ end

 function WeakAuras.RegisterTriggerSystemOptions(types, func)
  for _, v in ipairs(types) do
-    triggerTypesOptions[v] = func;
+    WeakAuras.triggerTypesOptions[v] = func;
  end
 end

@@ -7021,41 +7038,44 @@ function WeakAuras.ReplaceLocalizedRaidMarkers(txt)
  end
 end

-local trackableUnits = {}
-trackableUnits["player"] = true
-trackableUnits["target"] = true
-trackableUnits["focus"] = true
-trackableUnits["pet"] = true
-trackableUnits["vehicle"] = true
+do
+  local trackableUnits = {}
+  trackableUnits["player"] = true
+  trackableUnits["target"] = true
+  trackableUnits["focus"] = true
+  trackableUnits["pet"] = true
+  trackableUnits["vehicle"] = true
+  
+  for i = 1, 5 do
+    trackableUnits["arena" .. i] = true
+    trackableUnits["arenapet" .. i] = true
+  end
+  
+  for i = 1, 4 do
+    trackableUnits["party" .. i] = true
+    trackableUnits["partypet" .. i] = true
+  end
+  
+  for i = 1, MAX_BOSS_FRAMES do
+    trackableUnits["boss" .. i] = true
+  end
+  
+  for i = 1, 40 do
+    trackableUnits["raid" .. i] = true
+    trackableUnits["raidpet" .. i] = true
+  end

-for i = 1, 5 do
-  trackableUnits["arena" .. i] = true
-  trackableUnits["arenapet" .. i] = true
+  function WeakAuras.UntrackableUnit(unit)
+    return not trackableUnits[unit]
+  end
 end

-for i = 1, 4 do
-  trackableUnits["party" .. i] = true
-  trackableUnits["partypet" .. i] = true
-end
-
-for i = 1, MAX_BOSS_FRAMES do
-  trackableUnits["boss" .. i] = true
-end
-
-for i = 1, 40 do
-  trackableUnits["raid" .. i] = true
-  trackableUnits["raidpet" .. i] = true
-end
-
-
-function WeakAuras.UntrackableUnit(unit)
-  return not trackableUnits[unit]
-end
-
-local ownRealm = GetRealmName()
-function WeakAuras.UnitNameWithRealm(unit)
-  local name, realm = UnitName(unit)
-  return name or "", realm or ownRealm or ""
+do
+  local ownRealm = GetRealmName()
+  function WeakAuras.UnitNameWithRealm(unit)
+    local name, realm = UnitName(unit)
+    return name or "", realm or ownRealm or ""
+  end
 end

 function WeakAuras.ParseNameCheck(name)