Contribution of Personal Updates

ProvisionsTeamFormation.txt

@@ -1,22 +1,22 @@
-## Title: |c00C000Prov|r's TeamFormation 1.3.1b
-## Description: Affiche et gère la formation du groupe. (Show and Manage group formation)
-## Author: |c00C000Provision|r
-## SavedVariables: ProvTFSV
-## DependsOn: LibStub LibAddonMenu-2.0
-## APIVersion: 100025, 100026
-## Version: 1.3.1b
-
-; TeamFormation
-lang/en.lua
-lang/$(language).lua
-
-header.lua
-
-function/Error.lua
-function/Color.lua
-function/LAM2Panel.lua
-function/uiLoop.lua
-TeamFormation.lua
-TeamFormation.xml
-
-Bindings.xml
+## Title: |c00C000Prov|r's TeamFormation 1.3.4
+## Description: Affiche et gère la formation du groupe. (Show and Manage group formation) (Updated by Incanus)
+## Author: |c00C000Provision|r
+## SavedVariables: ProvTFSV
+## DependsOn: LibAddonMenu-2.0
+## APIVersion: 101038
+## Version: 1.3.4
+
+; TeamFormation
+lang/en.lua
+lang/$(language).lua
+
+header.lua
+
+function/Error.lua
+function/Color.lua
+function/LAM2Panel.lua
+function/uiLoop.lua
+TeamFormation.lua
+TeamFormation.xml
+
+Bindings.xml

README.md

@@ -1,12 +1,30 @@
-ProvisionsTeamFormation 1.3.1b
+ProvisionsTeamFormation 1.3.4
 =============
 
+
 TeamFormation is a user Interface for The Elder Scrolls Online, designed to show the positions and health of your teammates, like a radar.
 
 *I'm happy to share my addon with you, but please **don't make a fork on esoui or curse** without my authorization.*
 
 [![LibAddonMenu-2.0r26](https://img.shields.io/badge/LibAddonMenu-2.0r26-orange.svg)](http://www.esoui.com/downloads/info7-LibAddonMenu.html) [![Esoui Prov's TF page](https://img.shields.io/badge/esoui.com-Provision%27s%20TeamFormation-green.svg)](http://www.esoui.com/downloads/info1135-ProvisionsTeamFormation.html)
 
+# 1.3.4 Changelog
+
+Unofficial version Changelog:
+
+- Add Necromancer and Arcanist Icons
+- Shift icon assignment priority so group lead (crown) will take priority over group role
+- Adjust custom player color assignment to enable use of @NAMEs in addition to character names (character name settings will override @name settings)
+- Increase Group Lead icon size slightly (to do: add custom scaling settings)
+- Target Marker support for Target Markers applied to grouped players. (Target Markers will take priority over role or class icons but not group leader icon.)
+- Added Alpha settings for Group Leader, Role, Class, and Target Marker icons
+- Hid random map pins created by other addons
+- Update API version to 101038 (Necrom)
+- Update version number to 1.3.4
+
+
+(Note: this version also incorporates the changes made by [theviper121's version 1.3.2](https://www.esoui.com/downloads/info3526-ProvisionsTeamFormationTeammateRadartheviper121.html))
+
 # Presentation
 
 You can easily see the positions and health of your teammates :

function/LAM2Panel.lua

@@ -1,6 +1,13 @@
 local function colorizePseudo(rgb, pseudo)
 	local color = ZO_ColorDef:New(unpack(rgb))
-	return "|c" .. color:ToHex() .. "|t24:24:EsoUI/Art/Miscellaneous/Gamepad/gp_charNameIcon.dds:inheritcolor|t " .. pseudo
+	local icon = "EsoUI/Art/Miscellaneous/Gamepad/gp_charNameIcon.dds"
+	if pseudo:find("role_") then
+		local role = pseudo:gsub("role_", "")
+		if role == "healer" or role == "dps" or role == "tank" then
+		 icon = "EsoUI/Art/LFG/LFG_" .. role .. "_up.dds"
+		end
+	end
+	return "|c" .. color:ToHex() .. "|t24:24:" .. icon .. ":inheritcolor|t " .. pseudo
 end
 
 local function TeamFormation_mapChoices(func, array)
@@ -40,6 +47,10 @@ local function TeamFormation_reset()
 	ProvTF.vars.siege = ProvTF.defaults.siege
 
 	ProvTF.vars.myAlpha = ProvTF.defaults.myAlpha
+	ProvTF.vars.groupLeaderAlpha = ProvTF.defaults.groupLeaderAlpha
+	ProvTF.vars.targetMarkerAlpha = ProvTF.defaults.targetMarkerAlpha
+	ProvTF.vars.roleAlpha = ProvTF.defaults.roleAlpha
+	ProvTF.vars.classAlpha = ProvTF.defaults.classAlpha
 	ProvTF.vars.roleIcon = ProvTF.defaults.roleIcon
 
 	-- Don't pass default's jRules reference.
@@ -258,6 +269,16 @@ function TeamFormation_createLAM2Panel()
 					text = GetString(SI_TF_SETTING_PLAYERICON_TOOLTIP),
 				},
 				[2] = {
+					type = "checkbox",
+					name = GetString(SI_TF_SETTING_ROLE),
+					tooltip = GetString(SI_TF_SETTING_ROLE_TOOLTIP),
+					getFunc = function() return ProvTF.vars.roleIcon end,
+					setFunc = function(value)
+						ProvTF.vars.roleIcon = value
+					end,
+					width = "full",
+				},
+				[3] = {
 					type = "slider",
 					name = GetString(SI_TF_SETTING_YOURALPHA) .. " (%)",
 					tooltip = GetString(SI_TF_SETTING_YOURALPHA_TOOLTIP),
@@ -268,13 +289,47 @@ function TeamFormation_createLAM2Panel()
 					end,
 					width = "full",
 				},
-				[3] = {
-					type = "checkbox",
-					name = GetString(SI_TF_SETTING_ROLE),
-					tooltip = GetString(SI_TF_SETTING_ROLE_TOOLTIP),
-					getFunc = function() return ProvTF.vars.roleIcon end,
+				[4] = {
+					type = "slider",
+					name = GetString(SI_TF_SETTING_GROUPLEADERALPHA) .. " (%)",
+					tooltip = GetString(SI_TF_SETTING_SI_TF_SETTING_GROUPLEADERALPHA_TOOLTIP),
+					min = 0, max = 100, step = 1,
+					getFunc = function() return ProvTF.vars.groupLeaderAlpha * 100 end,
 					setFunc = function(value)
-						ProvTF.vars.roleIcon = value
+						ProvTF.vars.groupLeaderAlpha = value / 100
+					end,
+					width = "full",
+				},
+				[5] = {
+					type = "slider",
+					name = GetString(SI_TF_SETTING_TARGETMARKERALPHA) .. " (%)",
+					tooltip = GetString(SI_TF_SETTING_TARGETMARKERALPHA_TOOLTIP),
+					min = 0, max = 100, step = 1,
+					getFunc = function() return ProvTF.vars.targetMarkerAlpha * 100 end,
+					setFunc = function(value)
+						ProvTF.vars.targetMarkerAlpha = value / 100
+					end,
+					width = "full",
+				},
+				[6] = {
+					type = "slider",
+					name = GetString(SI_TF_SETTING_ROLEALPHA) .. " (%)",
+					tooltip = GetString(SI_TF_SETTING_ROLEALPHA_TOOLTIP),
+					min = 0, max = 100, step = 1,
+					getFunc = function() return ProvTF.vars.roleAlpha * 100 end,
+					setFunc = function(value)
+						ProvTF.vars.roleAlpha = value / 100
+					end,
+					width = "full",
+				},
+				[7] = {
+					type = "slider",
+					name = GetString(SI_TF_SETTING_CLASSALPHA) .. " (%)",
+					tooltip = GetString(SI_TF_SETTING_CLASSALPHA_TOOLTIP),
+					min = 0, max = 100, step = 1,
+					getFunc = function() return ProvTF.vars.classAlpha * 100 end,
+					setFunc = function(value)
+						ProvTF.vars.classAlpha = value / 100
 					end,
 					width = "full",
 				},
@@ -294,26 +349,36 @@ function TeamFormation_createLAM2Panel()
 					text = GetString(SI_TF_SETTING_COLOROPTIONS_TOOLTIP),
 				},
 				[2] = {
+					type = "description",
+					text = GetString(SI_TF_SETTING_COLOROPTIONS_TOOLTIP2),
+				},
+				[3] = {
 					type = "description",
 					text = GetString(SI_TF_SETTING_COLORRESET_TOOLTIP),
 					width = "half",
 				},
-				[3] = {
+				[4] = {
 					type = "button",
 					name = GetString(SI_TF_SETTING_COLORRESET),
 					tooltip = GetString(SI_TF_SETTING_COLORRESET_TOOLTIP),
 					func = function()
-						ProvTF.vars.jRules = {}
+						local ctrl_dropdown = WINDOW_MANAGER:GetControlByName("ProvTF#jRulesList")
+						local selected = ctrl_dropdown.combobox.m_comboBox:GetSelectedItem()
+						if selected ~= "" then
+							local pseudo = string.match(selected, "^.+\|t (.+)$")
+							ProvTF.vars.jRules[pseudo] = nil
+						end
 						WINDOW_MANAGER:GetControlByName("ProvTF#jRulesList"):UpdateChoices({})
+						ctrl_dropdown:UpdateChoices(TeamFormation_mapJRULES())
 					end,
 					width = "half"
 				},
-				[4] = {
+				[5] = {
 					type = "header",
 					name = GetString(SI_TF_SETTING_JRULES),
 					width = "full",
 				},
-				[5] = {
+				[6] = {
 					type = "editbox",
 					name = GetString(SI_TF_SETTING_JRULES_PSEUDOADD), -- or string id or function returning a string
 					tooltip = GetString(SI_TF_SETTING_JRULES_PSEUDOADD_TOOLTIP),
@@ -337,7 +402,7 @@ function TeamFormation_createLAM2Panel()
 					width = "full",
 					reference = "ProvTF#jRulesBox",
 				},
-				[6] = {
+				[7] = {
 					type = "button",
 					name = GetString(SI_TF_SETTING_JRULES_ADD),
 					tooltip = GetString(SI_TF_SETTING_JRULES_PSEUDOADD_TOOLTIP),
@@ -356,7 +421,7 @@ function TeamFormation_createLAM2Panel()
 					end,
 					width = "half",
 				},
-				[7] = {
+				[8] = {
 					type = "slider",
 					name = GetString(SI_TF_SETTING_JRULES_PICKPSEUDO),
 					tooltip = GetString(SI_TF_SETTING_JRULES_PICKPSEUDO_TOOLTIP),
@@ -375,7 +440,7 @@ function TeamFormation_createLAM2Panel()
 					width = "half",
 					disabled = function() return not IsUnitGrouped("player") end,
 				},
-				[8] = {
+				[9] = {
 					type = "dropdown",
 					name = GetString(SI_TF_SETTING_JRULES_PSEUDOCHOICE),
 					tooltip = GetString(SI_TF_SETTING_JRULES_PSEUDOCHOICE_TOOLTIP),
@@ -388,7 +453,7 @@ function TeamFormation_createLAM2Panel()
 					width = "half",
 					reference = "ProvTF#jRulesList",
 				},
-				[9] = {
+				[10] = {
 					type = "colorpicker",
 					name = GetString(SI_TF_SETTING_JRULES_COLORCHOICE) .. " (RGB)",
 					tooltip = GetString(SI_TF_SETTING_JRULES_COLORCHOICE_TOOLTIP),
@@ -423,7 +488,7 @@ function TeamFormation_createLAM2Panel()
 						return selected == ""
 					end,
 				},
-				[10] = {
+				[11] = {
 					type = "slider",
 					name = GetString(SI_TF_SETTING_JRULES_COLORCHOICE) .. " (HSL)",
 					tooltip = GetString(SI_TF_SETTING_JRULES_COLORCHOICE_TOOLTIP),