Fix PartyFinder class names

This commit is contained in:
Raymond 2021-08-24 10:22:31 -04:00
parent 8256e5431a
commit cca2c5decc
10 changed files with 29 additions and 29 deletions

View file

@ -25,7 +25,7 @@
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<OutDir>..\bin\$(Configuration)\</OutDir> <OutDir>..\bin\$(Configuration)\</OutDir>

View file

@ -26,7 +26,7 @@
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<OutDir>..\bin\$(Configuration)\</OutDir> <OutDir>..\bin\$(Configuration)\</OutDir>

View file

@ -1,12 +1,12 @@
using System; using System;
namespace Dalamud.Game.Gui.PartyFinder.Types namespace Dalamud.Game.Gui.PartyFinder.Types
{ {
/// <summary> /// <summary>
/// Condition flags for the <see cref="PartyFinder"/> class. /// Condition flags for the <see cref="PartyFinderGui"/> class.
/// </summary> /// </summary>
[Flags] [Flags]
public enum DutyFinderConditionFlags : uint public enum DutyConditionFlags : uint
{ {
/// <summary> /// <summary>
/// No duty condition. /// No duty condition.

View file

@ -1,9 +1,9 @@
namespace Dalamud.Game.Gui.PartyFinder.Types namespace Dalamud.Game.Gui.PartyFinder.Types
{ {
/// <summary> /// <summary>
/// Category flags for the <see cref="PartyFinder"/> class. /// Category flags for the <see cref="PartyFinderGui"/> class.
/// </summary> /// </summary>
public enum DutyFinderCategory public enum DutyCategory
{ {
/// <summary> /// <summary>
/// The duty category. /// The duty category.

View file

@ -3,7 +3,7 @@ using System;
namespace Dalamud.Game.Gui.PartyFinder.Types namespace Dalamud.Game.Gui.PartyFinder.Types
{ {
/// <summary> /// <summary>
/// Duty finder settings flags for the <see cref="PartyFinder"/> class. /// Duty finder settings flags for the <see cref="PartyFinderGui"/> class.
/// </summary> /// </summary>
[Flags] [Flags]
public enum DutyFinderSettingsFlags : uint public enum DutyFinderSettingsFlags : uint

View file

@ -1,9 +1,9 @@
namespace Dalamud.Game.Gui.PartyFinder.Types namespace Dalamud.Game.Gui.PartyFinder.Types
{ {
/// <summary> /// <summary>
/// Duty type flags for the <see cref="PartyFinder"/> class. /// Duty type flags for the <see cref="PartyFinderGui"/> class.
/// </summary> /// </summary>
public enum DutyType public enum PartyFinderDutyType
{ {
/// <summary> /// <summary>
/// No duty type. /// No duty type.

View file

@ -3,10 +3,10 @@ using System;
namespace Dalamud.Game.Gui.PartyFinder.Types namespace Dalamud.Game.Gui.PartyFinder.Types
{ {
/// <summary> /// <summary>
/// Loot rule flags for the <see cref="PartyFinder"/> class. /// Loot rule flags for the <see cref="PartyFinderGui"/> class.
/// </summary> /// </summary>
[Flags] [Flags]
public enum DutyFinderLootRuleFlags : uint public enum LootRuleFlags : uint
{ {
/// <summary> /// <summary>
/// No loot rules. /// No loot rules.

View file

@ -3,10 +3,10 @@ using System;
namespace Dalamud.Game.Gui.PartyFinder.Types namespace Dalamud.Game.Gui.PartyFinder.Types
{ {
/// <summary> /// <summary>
/// Objective flags for the <see cref="PartyFinder"/> class. /// Objective flags for the <see cref="PartyFinderGui"/> class.
/// </summary> /// </summary>
[Flags] [Flags]
public enum DutyFinderObjectiveFlags : uint public enum ObjectiveFlags : uint
{ {
/// <summary> /// <summary>
/// No objective. /// No objective.

View file

@ -46,10 +46,10 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
this.World = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.World)); this.World = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.World));
this.HomeWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.HomeWorld)); this.HomeWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.HomeWorld));
this.CurrentWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.CurrentWorld)); this.CurrentWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.CurrentWorld));
this.Category = (DutyFinderCategory)listing.Category; this.Category = (DutyCategory)listing.Category;
this.RawDuty = listing.Duty; this.RawDuty = listing.Duty;
this.Duty = new Lazy<ContentFinderCondition>(() => dataManager.GetExcelSheet<ContentFinderCondition>().GetRow(listing.Duty)); this.Duty = new Lazy<ContentFinderCondition>(() => dataManager.GetExcelSheet<ContentFinderCondition>().GetRow(listing.Duty));
this.DutyType = (DutyType)listing.DutyType; this.DutyType = (PartyFinderDutyType)listing.DutyType;
this.BeginnersWelcome = listing.BeginnersWelcome == 1; this.BeginnersWelcome = listing.BeginnersWelcome == 1;
this.SecondsRemaining = listing.SecondsRemaining; this.SecondsRemaining = listing.SecondsRemaining;
this.MinimumItemLevel = listing.MinimumItemLevel; this.MinimumItemLevel = listing.MinimumItemLevel;
@ -101,7 +101,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// <summary> /// <summary>
/// Gets the Party Finder category this listing is listed under. /// Gets the Party Finder category this listing is listed under.
/// </summary> /// </summary>
public DutyFinderCategory Category { get; } public DutyCategory Category { get; }
/// <summary> /// <summary>
/// Gets the row ID of the duty this listing is for. May be 0 for non-duty listings. /// Gets the row ID of the duty this listing is for. May be 0 for non-duty listings.
@ -116,7 +116,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// <summary> /// <summary>
/// Gets the type of duty this listing is for. /// Gets the type of duty this listing is for.
/// </summary> /// </summary>
public DutyType DutyType { get; } public PartyFinderDutyType DutyType { get; }
/// <summary> /// <summary>
/// Gets a value indicating whether if this listing is beginner-friendly. Shown with a sprout icon in-game. /// Gets a value indicating whether if this listing is beginner-friendly. Shown with a sprout icon in-game.
@ -152,12 +152,12 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// <summary> /// <summary>
/// Gets the objective of this listing. /// Gets the objective of this listing.
/// </summary> /// </summary>
public DutyFinderObjectiveFlags Objective => (DutyFinderObjectiveFlags)this.objective; public ObjectiveFlags Objective => (ObjectiveFlags)this.objective;
/// <summary> /// <summary>
/// Gets the conditions of this listing. /// Gets the conditions of this listing.
/// </summary> /// </summary>
public DutyFinderConditionFlags Conditions => (DutyFinderConditionFlags)this.conditions; public PartyFinderConditionFlags Conditions => (PartyFinderConditionFlags)this.conditions;
/// <summary> /// <summary>
/// Gets the Duty Finder settings that will be used for this listing. /// Gets the Duty Finder settings that will be used for this listing.
@ -167,13 +167,13 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// <summary> /// <summary>
/// Gets the loot rules that will be used for this listing. /// Gets the loot rules that will be used for this listing.
/// </summary> /// </summary>
public DutyFinderLootRuleFlags LootRules => (DutyFinderLootRuleFlags)this.lootRules; public LootRuleFlags LootRules => (LootRuleFlags)this.lootRules;
/// <summary> /// <summary>
/// Gets where this listing is searching. Note that this is also used for denoting alliance raid listings and one /// Gets where this listing is searching. Note that this is also used for denoting alliance raid listings and one
/// player per job. /// player per job.
/// </summary> /// </summary>
public DutyFinderSearchAreaFlags SearchArea => (DutyFinderSearchAreaFlags)this.searchArea; public SearchAreaFlags SearchArea => (SearchAreaFlags)this.searchArea;
/// <summary> /// <summary>
/// Gets a list of the class/job IDs that are currently present in the party. /// Gets a list of the class/job IDs that are currently present in the party.
@ -192,14 +192,14 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// </summary> /// </summary>
/// <param name="flag">The flag to check for.</param> /// <param name="flag">The flag to check for.</param>
/// <returns>A value indicating whether the flag is present.</returns> /// <returns>A value indicating whether the flag is present.</returns>
public bool this[DutyFinderObjectiveFlags flag] => this.objective == 0 || (this.objective & (uint)flag) > 0; public bool this[ObjectiveFlags flag] => this.objective == 0 || (this.objective & (uint)flag) > 0;
/// <summary> /// <summary>
/// Check if the given flag is present. /// Check if the given flag is present.
/// </summary> /// </summary>
/// <param name="flag">The flag to check for.</param> /// <param name="flag">The flag to check for.</param>
/// <returns>A value indicating whether the flag is present.</returns> /// <returns>A value indicating whether the flag is present.</returns>
public bool this[DutyFinderConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0; public bool this[PartyFinderConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0;
/// <summary> /// <summary>
/// Check if the given flag is present. /// Check if the given flag is present.
@ -213,14 +213,14 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// </summary> /// </summary>
/// <param name="flag">The flag to check for.</param> /// <param name="flag">The flag to check for.</param>
/// <returns>A value indicating whether the flag is present.</returns> /// <returns>A value indicating whether the flag is present.</returns>
public bool this[DutyFinderLootRuleFlags flag] => this.lootRules == 0 || (this.lootRules & (uint)flag) > 0; public bool this[LootRuleFlags flag] => this.lootRules == 0 || (this.lootRules & (uint)flag) > 0;
/// <summary> /// <summary>
/// Check if the given flag is present. /// Check if the given flag is present.
/// </summary> /// </summary>
/// <param name="flag">The flag to check for.</param> /// <param name="flag">The flag to check for.</param>
/// <returns>A value indicating whether the flag is present.</returns> /// <returns>A value indicating whether the flag is present.</returns>
public bool this[DutyFinderSearchAreaFlags flag] => this.searchArea == 0 || (this.searchArea & (uint)flag) > 0; public bool this[SearchAreaFlags flag] => this.searchArea == 0 || (this.searchArea & (uint)flag) > 0;
#endregion #endregion

View file

@ -3,7 +3,7 @@ using System;
namespace Dalamud.Game.Gui.PartyFinder.Types namespace Dalamud.Game.Gui.PartyFinder.Types
{ {
/// <summary> /// <summary>
/// Search area flags for the <see cref="PartyFinder"/> class. /// Search area flags for the <see cref="PartyFinderGui"/> class.
/// </summary> /// </summary>
[Flags] [Flags]
public enum DutyFinderSearchAreaFlags : uint public enum DutyFinderSearchAreaFlags : uint