diff --git a/SVUI_ActionBars/SVUI_ActionBars.lua b/SVUI_ActionBars/SVUI_ActionBars.lua
index b4c2a25..544a1fd 100644
--- a/SVUI_ActionBars/SVUI_ActionBars.lua
+++ b/SVUI_ActionBars/SVUI_ActionBars.lua
@@ -91,6 +91,7 @@ local SEQUENCE_PATTERN = '%s [bar:%d] %d;';
and once when the mod is loaded.
]]--
local TOTAL_BARS = 6;
+local SELF_CASTING = false;
--[[
##########################################################
LOCAL FUNCTIONS
@@ -623,7 +624,7 @@ do
end
end
- local function _refreshButtons(bar, id, max, space, cols, totalButtons, size, point, selfcast)
+ local function _refreshButtons(bar, id, max, space, cols, totalButtons, size, point)
if InCombatLockdown() then return end
if not bar then return end
local hideByScale = id == "Pet" and true or false;
@@ -639,7 +640,7 @@ do
button:ModSize(size)
button:SetAttribute("showgrid",1)
- if(selfcast) then
+ if(SELF_CASTING) then
button:SetAttribute("unit2", "player")
end
@@ -751,7 +752,6 @@ do
if(not bar or not db) then return end
- local selfcast = db.rightClickSelf
local space = db.buttonspacing;
local cols = db.buttonsPerRow;
local size = db.buttonsize;
@@ -788,7 +788,7 @@ do
bar._fade = false
end
- _refreshButtons(bar, id, max, space, cols, totalButtons, size, point, selfcast);
+ _refreshButtons(bar, id, max, space, cols, totalButtons, size, point);
self:RefreshMainAnchor()
if(isPet or isStance) then
@@ -1489,6 +1489,7 @@ function MOD:UpdateLocals()
if not db then return end
TOTAL_BARS = db.barCount
+ SELF_CASTING = db.rightClickSelf
end
function MOD:ReLoad()
diff --git a/SVUI_FightOMatic/SVUI_FightOMatic.lua b/SVUI_FightOMatic/SVUI_FightOMatic.lua
index 312affd..56f5818 100644
--- a/SVUI_FightOMatic/SVUI_FightOMatic.lua
+++ b/SVUI_FightOMatic/SVUI_FightOMatic.lua
@@ -509,7 +509,23 @@ function PLUGIN:ScannerLog(enemy)
end
function PLUGIN:UpdateCommunicator()
- if(not self.InPVP) then
+ if(self.InPVP) then
+ self.COMM.Unavailable:Show()
+ for i = 1, 5 do
+ local nodeName = ("SVUI_PVPNode%d"):format(i)
+ local node = _G[nodeName]
+ local safe = node.Safe
+ local help = node.Help
+ safe.name = ""
+ help.name = ""
+ node.Text:SetText("")
+ node:Hide()
+ end
+ self.InPVP = nil
+ self:RegisterEvent("UPDATE_BATTLEFIELD_SCORE")
+ self.Scanning = true
+ self:PopulateScans()
+ else
local mapID = GetCurrentMapAreaID()
if(mapID) then
local points = PVP_NODES[mapID]
@@ -539,23 +555,6 @@ function PLUGIN:UpdateCommunicator()
self:PauseScanner()
end
end
- elseif(self.InPVP) then
- self.COMM.Unavailable:Show()
- for i = 1, 5 do
- local nodeName = ("SVUI_PVPNode%d"):format(i)
- local node = _G[nodeName]
- local safe = node.Safe
- local help = node.Help
- safe.name = ""
- help.name = ""
- node.Text:SetText("")
- node:Hide()
- end
- self.InPVP = nil
- self:RegisterEvent("UPDATE_BATTLEFIELD_SCORE")
- self.Scanning = true
-
- self:PopulateScans()
end
end
diff --git a/SVUI_Maps/Loader.lua b/SVUI_Maps/Loader.lua
index aab0b1a..abd87aa 100644
--- a/SVUI_Maps/Loader.lua
+++ b/SVUI_Maps/Loader.lua
@@ -1,7 +1,7 @@
--[[
##########################################################
S V U I By: Munglunch
-##########################################################
+##########################################################
LOCALIZED LUA FUNCTIONS
##########################################################
]]--
@@ -17,14 +17,14 @@ local L = SV.L
local MOD = SV:NewModule(...);
local Schema = MOD.Schema;
local textSelect = {
- ['HIDE'] = L['Hide This'],
- ['CUSTOM'] = L['Use Custom Style'],
+ ['HIDE'] = L['Hide This'],
+ ['CUSTOM'] = L['Use Custom Style'],
['SIMPLE'] = L['Use Simple Style']
};
local colorSelect = {
- ['light'] = L['Light'],
+ ['light'] = L['Light'],
['dark'] = L['Dark'],
- ['darkest'] = L['Darkest'],
+ ['darkest'] = L['Darkest'],
['class'] = L['Class']
};
@@ -54,22 +54,21 @@ SV.defaults[Schema] = {
["PocketPlot"] = true,
},
["customIcons"] = true,
- ["mapAlpha"] = 1,
- ["tinyWorldMap"] = true,
- ["size"] = 240,
- ["mapShape"] = 'RECTANGLE',
+ ["tinyWorldMap"] = true,
+ ["size"] = 240,
+ ["mapShape"] = 'RECTANGLE',
["miniPlayerXY"] = true,
["worldPlayerXY"] = true,
["worldMouseXY"] = true,
- ["bordersize"] = 4,
- ["bordercolor"] = "light",
+ ["bordersize"] = 4,
+ ["bordercolor"] = "light",
["locationText"] = "CUSTOM",
["minimapbar"] = {
- ["enable"] = true,
- ["styleType"] = "HORIZONTAL",
- ["layoutDirection"] = "NORMAL",
- ["buttonSize"] = 28,
- ["mouseover"] = false,
+ ["enable"] = true,
+ ["styleType"] = "HORIZONTAL",
+ ["layoutDirection"] = "NORMAL",
+ ["buttonSize"] = 28,
+ ["mouseover"] = false,
},
};
@@ -86,13 +85,13 @@ function MOD:LoadOptions()
desc = "Font used for coordinates."
},
};
-
+
SV:GenerateFontOptionGroup("Maps", 10, "Fonts used for the minimap.", mapFonts)
- SV.Options.args[Schema] = {
- name = Schema,
+ SV.Options.args[Schema] = {
+ name = Schema,
type = 'group',
- childGroups = "tree",
+ childGroups = "tree",
get = function(a)return SV.db[Schema][a[#a]]end,
set = function(a,b)MOD:ChangeDBVar(b,a[#a]);MOD:ReLoad()end,
args = {
@@ -104,7 +103,7 @@ function MOD:LoadOptions()
},
common = {
order = 2,
- type = "group",
+ type = "group",
name = MINIMAP_LABEL,
desc = L['General display settings'],
guiInline = true,
@@ -158,14 +157,14 @@ function MOD:LoadOptions()
},
spacer1 = {
order = 4,
- type = "group",
+ type = "group",
name = "",
- guiInline = true,
- args = {}
+ guiInline = true,
+ args = {}
},
common2 = {
order = 5,
- type = "group",
+ type = "group",
name = "Labels and Info",
desc = L['Configure various worldmap and minimap texts'],
guiInline = true,
@@ -199,9 +198,9 @@ function MOD:LoadOptions()
},
spacer2 = {
order = 6,
- type = "group",
+ type = "group",
name = "",
- guiInline = true,
+ guiInline = true,
args = {}
},
mmButtons = {
@@ -219,9 +218,9 @@ function MOD:LoadOptions()
set = function(a,b)MOD:ChangeDBVar(b,a[#a],"minimapbar")SV:StaticPopup_Show("RL_CLIENT")end,
},
mouseover = {
- order = 2,
- name = L["Mouse Over"],
- desc = L["Hidden unless you mouse over the frame."],
+ order = 2,
+ name = L["Mouse Over"],
+ desc = L["Hidden unless you mouse over the frame."],
type = "toggle",
set = function(a,b) MOD:ChangeDBVar(b,a[#a],"minimapbar") MOD:UpdateMinimapButtonSettings(true) end,
},
@@ -254,16 +253,16 @@ function MOD:LoadOptions()
},
spacer3 = {
order = 8,
- type = "group",
+ type = "group",
name = "",
- guiInline = true,
+ guiInline = true,
args = {}
},
worldMap = {
order = 9,
type = "group",
name = "WorldMap",
- guiInline = true,
+ guiInline = true,
args = {
tinyWorldMap = {
order = 1,
@@ -273,7 +272,7 @@ function MOD:LoadOptions()
set = function(a,b)MOD:ChangeDBVar(b,a[#a])MOD:ReLoad()end
},
}
- },
+ },
}
}
-end
\ No newline at end of file
+end
diff --git a/SVUI_Tooltip/Loader.lua b/SVUI_Tooltip/Loader.lua
index 002d47b..a8b60e6 100644
--- a/SVUI_Tooltip/Loader.lua
+++ b/SVUI_Tooltip/Loader.lua
@@ -1,7 +1,7 @@
--[[
##########################################################
S V U I By: Munglunch
-##########################################################
+##########################################################
LOCALIZED LUA FUNCTIONS
##########################################################
]]--
@@ -27,24 +27,25 @@ MOD.media.leftArt = [[Interface\AddOns\SVUI_Tooltip\assets\TT-LEFT]];
SV.defaults[Schema] = {
["themed"] = true,
- ["cursorAnchor"] = false,
- ["targetInfo"] = true,
- ["playerTitles"] = true,
- ["guildRanks"] = true,
- ["inspectInfo"] = false,
- ["itemCount"] = true,
- ["spellID"] = false,
- ["progressInfo"] = true,
+ ["cursorAnchor"] = false,
+ ["targetInfo"] = true,
+ ["playerTitles"] = true,
+ ["playerGender"] = false,
+ ["guildRanks"] = true,
+ ["inspectInfo"] = false,
+ ["itemCount"] = true,
+ ["spellID"] = false,
+ ["progressInfo"] = true,
["visibility"] = {
- ["unitFrames"] = "NONE",
- ["combat"] = false,
- },
+ ["unitFrames"] = "NONE",
+ ["combat"] = false,
+ },
["healthBar"] = {
- ["text"] = true,
- ["height"] = 10,
- ["font"] = "SVUI Default Font",
- ["fontSize"] = 10,
- },
+ ["text"] = true,
+ ["height"] = 10,
+ ["font"] = "SVUI Default Font",
+ ["fontSize"] = 10,
+ },
};
SV:AssignMedia("font", "tipdialog", "SVUI Default Font", 12, "OUTLINE");
@@ -63,77 +64,83 @@ function MOD:LoadOptions()
desc = "Font used in tooltips to display large names."
},
};
-
+
SV:GenerateFontOptionGroup("Tooltip", 8, "Fonts used in tooltips.", tipFonts)
-
+
SV.Options.args[Schema] = {
- type = "group",
- name = Schema,
- childGroups = "tab",
- get = function(a)return SV.db[Schema][a[#a]] end,
- set = function(a, b) MOD:ChangeDBVar(b,a[#a]); end,
+ type = "group",
+ name = Schema,
+ childGroups = "tab",
+ get = function(a)return SV.db[Schema][a[#a]] end,
+ set = function(a, b) MOD:ChangeDBVar(b,a[#a]); end,
args = {
commonGroup = {
- order = 1,
- type = "group",
+ order = 1,
+ type = "group",
name = L["Tooltip Options"],
- guiInline = true,
+ guiInline = true,
args = {
intro = {
- order = 1,
- type = "description",
+ order = 1,
+ type = "description",
name = L["TOOLTIP_DESC"]
},
common = {
- order = 3,
- type = "group",
+ order = 3,
+ type = "group",
name = L["General"],
- guiInline = true,
+ guiInline = true,
args = {
cursorAnchor = {
- order = 1,
+ order = 1,
type = "toggle",
- name = L["Cursor Anchor"],
+ name = L["Cursor Anchor"],
desc = L["Should tooltip be anchored to mouse cursor"]
},
targetInfo = {
- order = 2,
- type = "toggle",
- name = L["Target Info"],
+ order = 2,
+ type = "toggle",
+ name = L["Target Info"],
desc = L["When in a raid group display if anyone in your raid is targeting the current tooltip unit."]
},
playerTitles = {
- order = 3,
- type = "toggle",
- name = L["Player Titles"],
+ order = 3,
+ type = "toggle",
+ name = L["Player Titles"],
desc = L["Display player titles."]
},
+ playerGender = {
+ order = 4,
+ type = "toggle",
+ name = L["Player Gender"],
+ desc = L["Display player gender."]
+ },
guildRanks = {
- order = 4,
- type = "toggle",
- name = L["Guild Ranks"],
+ order = 5,
+ type = "toggle",
+ name = L["Guild Ranks"],
desc = L["Display guild ranks if a unit is guilded."]
},
inspectInfo = {
- order = 5,
- type = "toggle",
- name = L["Talent Spec"],
+ order = 6,
+ type = "toggle",
+ name = L["Talent Spec"],
desc = L["Display the players talent spec in the tooltip, this may not immediately update when mousing over a unit."]
},
spellID = {
- order = 6,
- type = "toggle",
- name = L["Spell/Item IDs"],
+ order = 7,
+ type = "toggle",
+ name = L["Spell/Item IDs"],
desc = L["Display the spell or item ID when mousing over a spell or item tooltip."],
- get = function(a)return SV.db[Schema].spellID end,
+ get = function(a)return SV.db[Schema].spellID end,
set = function(a, b) MOD:ChangeDBVar(b, "spellID") end,
},
itemCount = {
- order = 7,
- type = "toggle",
- name = L["Item Counts"],
+ order = 8,
+ type = "toggle",
+ name = L["Item Counts"],
desc = L["Display the total owned of an item across all recently played characters."],
- get = function(a)return SV.db[Schema].itemCount end,
+ get = function(a)return SV.db[Schema].itemCount end,
set = function(a, b) MOD:ChangeDBVar(b, "itemCount") end,
},
}
@@ -142,7 +149,7 @@ function MOD:LoadOptions()
visibility={
order=100,
type="group",
- guiInline = true,
+ guiInline = true,
name=L["Visibility"],
get=function(a)return SV.db[Schema].visibility[a[#a]]end,
set=function(a,b)SV.db[Schema].visibility[a[#a]]=b end,
@@ -154,19 +161,19 @@ function MOD:LoadOptions()
healthBar={
order=200,
type="group",
- guiInline = true,
+ guiInline = true,
name=L["Health Bar"],
get=function(a)return SV.db[Schema].healthBar[a[#a]]end,
set=function(a,b)SV.db[Schema].healthBar[a[#a]]=b end,
args={
height = {
- order = 1,
- name = L["Height"],
- type = "range",
- min = 1,
- max = 15,
- step = 1,
- width = "full",
+ order = 1,
+ name = L["Height"],
+ type = "range",
+ min = 1,
+ max = 15,
+ step = 1,
+ width = "full",
set = function(a,b)SV.db[Schema].healthBar.height = b;GameTooltipStatusBar:ModHeight(b)end
},
}
@@ -175,4 +182,4 @@ function MOD:LoadOptions()
}
}
}
-end
\ No newline at end of file
+end
diff --git a/SVUI_Tooltip/SVUI_Tooltip.lua b/SVUI_Tooltip/SVUI_Tooltip.lua
index 4512757..64543fe 100644
--- a/SVUI_Tooltip/SVUI_Tooltip.lua
+++ b/SVUI_Tooltip/SVUI_Tooltip.lua
@@ -104,6 +104,7 @@ local NewHook = _G.hooksecurefunc;
local playerGUID = UnitGUID("player");
local targetList, inspectCache = {}, {};
+local GENDER = {"", "Male ", "Female "};
local NIL_COLOR = { r = 0, g = 0, b = 0 };
local TAPPED_COLOR = { r = .6, g = .6, b = .6 };
local SKULL_ICON = "|TInterface\\TARGETINGFRAME\\UI-TargetingFrame-Skull.blp:16:16|t";
@@ -156,6 +157,7 @@ local SPELL_IDS = false;
local ON_CURSOR = false;
local TARGET_INFO = true;
local PLAYER_INFO = true;
+local GENDER_INFO = false;
local INSPECT_INFO = false;
local GUILD_INFO = true;
local VISIBILITY_UNITS = "NONE";
@@ -407,36 +409,41 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self)
local unitLevel = UnitLevel(unit)
local colors, burst, qColor, totColor;
local lvlLine;
+ local lineIncrement = 2;
local isShiftKeyDown = IsShiftKeyDown()
if UnitIsPlayer(unit) then
local className, classToken = UnitClass(unit)
local unitName, unitRealm = UnitName(unit)
local guildName, guildRankName, _, guildRealm = GetGuildInfo(unit)
- local pvpName = UnitPVPName(unit)
+ local gender = GENDER[UnitSex(unit)];
local realmRelation = UnitRealmRelationship(unit)
+ local nameString, genderString = "", "";
colors = RAID_CLASS_COLORS[classToken]
burst = CUSTOM_CLASS_COLORS[classToken]
- if(PLAYER_INFO and pvpName) then
- unitName = pvpName
+ if(PLAYER_INFO) then
+ nameString = UnitPVPName(unit) or unitName
+ else
+ nameString = unitName
end
+
if unitRealm and unitRealm ~= "" then
if(isShiftKeyDown) then
- unitName = unitName.."-"..unitRealm
+ nameString = nameString.."-"..unitRealm
elseif(realmRelation == LE_REALM_RELATION_COALESCED) then
- unitName = unitName..FOREIGN_SERVER_LABEL
+ nameString = nameString..FOREIGN_SERVER_LABEL
elseif(realmRelation == LE_REALM_RELATION_VIRTUAL) then
- unitName = unitName..INTERACTIVE_SERVER_LABEL
+ nameString = nameString..INTERACTIVE_SERVER_LABEL
end
end
if(UnitIsAFK(unit)) then
- GameTooltipTextLeft1:SetFormattedText("[|cffFF0000%s|r] |c%s%s|r ", L["AFK"], colors.colorStr, unitName)
+ GameTooltipTextLeft1:SetFormattedText("[|cffFF0000%s|r] |c%s%s|r ", L["AFK"], colors.colorStr, nameString)
elseif(UnitIsDND(unit)) then
- GameTooltipTextLeft1:SetFormattedText("[|cffFF9900%s|r] |c%s%s|r ", L["DND"], colors.colorStr, unitName)
+ GameTooltipTextLeft1:SetFormattedText("[|cffFF9900%s|r] |c%s%s|r ", L["DND"], colors.colorStr, nameString)
else
- GameTooltipTextLeft1:SetFormattedText("|c%s%s|r", colors.colorStr, unitName)
+ GameTooltipTextLeft1:SetFormattedText("|c%s%s|r", colors.colorStr, nameString)
end
if(guildName) then
@@ -449,15 +456,19 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self)
else
GameTooltipTextLeft2:SetText(("<|cff00ff10%s|r>"):format(guildName))
end
- lvlLine = tiplevel(self, 3)
- else
- lvlLine = tiplevel(self, 2)
+ lineIncrement = lineIncrement + 1
end
+ lvlLine = tiplevel(self, lineIncrement)
+
if(lvlLine) then
qColor = GetQuestDifficultyColor(unitLevel)
local race, englishRace = UnitRace(unit)
local _, factionGroup = UnitFactionGroup(unit)
+ if(GENDER_INFO) then
+ local gender = GENDER[UnitSex(unit)];
+ if(gender) then race = gender .. " " .. race end
+ end
if(factionGroup and englishRace == "Pandaren") then
race = factionGroup.." "..race
end
@@ -902,6 +913,7 @@ function MOD:UpdateLocals()
BAR_TEXT = SV.db.Tooltip.healthBar.text;
TARGET_INFO = SV.db.Tooltip.targetInfo;
PLAYER_INFO = SV.db.Tooltip.playerTitles;
+ GENDER_INFO = SV.db.Tooltip.playerGender;
INSPECT_INFO = SV.db.Tooltip.inspectInfo;
GUILD_INFO = SV.db.Tooltip.guildRanks;
VISIBILITY_UNITS = SV.db.Tooltip.visibility.unitFrames;