(fix/visual) Adjust load options to the correct locations

This commit is contained in:
NoM0Re
2024-11-28 12:52:42 +01:00
parent 9bab67090f
commit 0b4f47108a
2 changed files with 26 additions and 26 deletions
+24 -24
View File
@@ -816,6 +816,13 @@ Private.load_prototype = {
optional = true,
events = {"PLAYER_REGEN_DISABLED", "PLAYER_REGEN_ENABLED"}
},
{
name = "never",
display = L["Never"],
type = "toggle",
width = WeakAuras.normalWidth,
init = "false",
},
{
name = "alive",
display = L["Alive"],
@@ -834,13 +841,6 @@ Private.load_prototype = {
optional = true,
events = {"PLAYER_FLAGS_CHANGED", "UNIT_FACTION", "ZONE_CHANGED"}
},
{
name = "never",
display = L["Never"],
type = "toggle",
width = WeakAuras.normalWidth,
init = "false",
},
{
name = "vehicle",
display = L["In Vehicle"],
@@ -859,23 +859,6 @@ Private.load_prototype = {
optional = true,
events = {"VEHICLE_UPDATE", "UNIT_ENTERED_VEHICLE", "UNIT_EXITED_VEHICLE"}
},
{
name = "raid_role",
display = L["Raid Role"],
type = "multiselect",
values = "raid_role_types",
init = "arg",
events = {"PLAYER_ROLES_ASSIGNED"}
},
{
name = "ingroup",
display = L["Group Type"],
type = "multiselect",
width = WeakAuras.normalWidth,
init = "arg",
values = "group_types",
events = {"PARTY_MEMBERS_CHANGED", "RAID_ROSTER_UPDATE"},
},
{
name ="playerTitle",
display = L["Player"],
@@ -995,6 +978,23 @@ Private.load_prototype = {
limit = 2
},
},
{
name = "raid_role",
display = L["Raid Role"],
type = "multiselect",
values = "raid_role_types",
init = "arg",
events = {"PLAYER_ROLES_ASSIGNED"}
},
{
name = "ingroup",
display = L["Group Type"],
type = "multiselect",
width = WeakAuras.normalWidth,
init = "arg",
values = "group_types",
events = {"PARTY_MEMBERS_CHANGED", "RAID_ROSTER_UPDATE"},
},
{
name = "group_leader",
display = WeakAuras.newFeatureString .. L["Group Leader/Assist"],
+2 -2
View File
@@ -1363,8 +1363,8 @@ local function scanForLoadsImpl(toCheck, event, arg1, ...)
if (data and not data.controlledChildren) then
local loadFunc = loadFuncs[id];
local loadOpt = loadFuncsForOptions[id];
shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", inCombat, alive, pvp, vehicle, vehicleUi, raidRole, group, player, realm, class, race, faction, playerLevel, raidMemberType, zone, zoneId, subzone, size, difficulty);
couldBeLoaded = loadOpt and loadOpt("ScanForLoads_Auras", inCombat, alive, pvp, vehicle, vehicleUi, raidRole, group, player, realm, class, race, faction, playerLevel, raidMemberType, zone, zoneId, subzone, size, difficulty);
shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", inCombat, alive, pvp, vehicle, vehicleUi, player, realm, class, race, faction, playerLevel, raidRole, group, raidMemberType, zone, zoneId, subzone, size, difficulty);
couldBeLoaded = loadOpt and loadOpt("ScanForLoads_Auras", inCombat, alive, pvp, vehicle, vehicleUi, player, realm, class, race, faction, playerLevel, raidRole, group, raidMemberType, zone, zoneId, subzone, size, difficulty);
if(shouldBeLoaded and not loaded[id]) then
changed = changed + 1;