ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #498 from goatcorp/pf

Browse source
This commit is contained in:
goaaats 2021-08-24 16:49:17 +02:00 • committed by GitHub
commit 12c5740afc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud.Boot/Dalamud.Boot.vcxproj
View file

@ -103,4 +103,4 @@
<Delete Files="$(OutDir)$(TargetName).lib" />
<Delete Files="$(OutDir)$(TargetName).exp" />
</Target>
</Project>
</Project>

2
Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj
View file

@ -110,4 +110,4 @@
<Delete Files="$(OutDir)$(TargetName).lib" />
<Delete Files="$(OutDir)$(TargetName).exp" />
</Target>
</Project>
</Project>

4
Dalamud/Game/Gui/PartyFinder/Types/DutyFinderConditionFlags.cs → Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs
View file

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

4
Dalamud/Game/Gui/PartyFinder/Types/DutyFinderCategory.cs → Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs
View file

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

2
Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs
View file

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

2
Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs
View file

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

4
Dalamud/Game/Gui/PartyFinder/Types/DutyFinderLootRuleFlags.cs → Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs
View file

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

4
Dalamud/Game/Gui/PartyFinder/Types/DutyFinderObjectiveFlags.cs → Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs
View file

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

20
Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs
View file

@ -46,7 +46,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
this.World = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.World));
this.HomeWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.HomeWorld));
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.Duty = new Lazy<ContentFinderCondition>(() => dataManager.GetExcelSheet<ContentFinderCondition>().GetRow(listing.Duty));
this.DutyType = (DutyType)listing.DutyType;
@ -101,7 +101,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// <summary>
/// Gets the Party Finder category this listing is listed under.
/// </summary>
public DutyFinderCategory Category { get; }
public DutyCategory Category { get; }
/// <summary>
/// Gets the row ID of the duty this listing is for. May be 0 for non-duty listings.
@ -152,12 +152,12 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// <summary>
/// Gets the objective of this listing.
/// </summary>
public DutyFinderObjectiveFlags Objective => (DutyFinderObjectiveFlags)this.objective;
public ObjectiveFlags Objective => (ObjectiveFlags)this.objective;
/// <summary>
/// Gets the conditions of this listing.
/// </summary>
public DutyFinderConditionFlags Conditions => (DutyFinderConditionFlags)this.conditions;
public ConditionFlags Conditions => (ConditionFlags)this.conditions;
/// <summary>
/// Gets the Duty Finder settings that will be used for this listing.
@ -167,13 +167,13 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// <summary>
/// Gets the loot rules that will be used for this listing.
/// </summary>
public DutyFinderLootRuleFlags LootRules => (DutyFinderLootRuleFlags)this.lootRules;
public LootRuleFlags LootRules => (LootRuleFlags)this.lootRules;
/// <summary>
/// Gets where this listing is searching. Note that this is also used for denoting alliance raid listings and one
/// player per job.
/// </summary>
public DutyFinderSearchAreaFlags SearchArea => (DutyFinderSearchAreaFlags)this.searchArea;
public SearchAreaFlags SearchArea => (SearchAreaFlags)this.searchArea;
/// <summary>
/// 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>
/// <param name="flag">The flag to check for.</param>
/// <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>
/// Check if the given flag is present.
/// </summary>
/// <param name="flag">The flag to check for.</param>
/// <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[ConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0;
/// <summary>
/// Check if the given flag is present.
@ -213,14 +213,14 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// </summary>
/// <param name="flag">The flag to check for.</param>
/// <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>
/// Check if the given flag is present.
/// </summary>
/// <param name="flag">The flag to check for.</param>
/// <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

4
Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSearchAreaFlags.cs → Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs
View file

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