Minor code style changes
This commit is contained in:
parent
299754735b
commit
8442fb28f5
@ -1,5 +1,5 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup Condition="$(MSBuildProjectName) != 'GatheringPathRenderer'">
|
<PropertyGroup Condition="$(MSBuildProjectName) != 'GatheringPathRenderer'">
|
||||||
<Version>4.16</Version>
|
<Version>4.17</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -1015,3 +1015,7 @@ csharp_style_inlined_variable_declaration = true:suggestion
|
|||||||
csharp_style_deconstructed_variable_declaration = true:suggestion
|
csharp_style_deconstructed_variable_declaration = true:suggestion
|
||||||
csharp_style_unused_value_assignment_preference = discard_variable:suggestion
|
csharp_style_unused_value_assignment_preference = discard_variable:suggestion
|
||||||
csharp_style_unused_value_expression_statement_preference = discard_variable:silent
|
csharp_style_unused_value_expression_statement_preference = discard_variable:silent
|
||||||
|
|
||||||
|
resharper_arrange_trailing_comma_in_multiline_lists_highlighting = none
|
||||||
|
resharper_redundant_if_else_block_highlighting = none
|
||||||
|
resharper_convert_to_primary_constructor_highlighting = hint
|
||||||
|
@ -7,7 +7,6 @@ using Dalamud.Game.Addon.Lifecycle;
|
|||||||
using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
|
using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
|
||||||
using Dalamud.Game.ClientState.Objects;
|
using Dalamud.Game.ClientState.Objects;
|
||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
using FFXIVClientStructs.FFXIV.Client.Game;
|
|
||||||
using FFXIVClientStructs.FFXIV.Client.Game.Event;
|
using FFXIVClientStructs.FFXIV.Client.Game.Event;
|
||||||
using FFXIVClientStructs.FFXIV.Client.Game.InstanceContent;
|
using FFXIVClientStructs.FFXIV.Client.Game.InstanceContent;
|
||||||
using FFXIVClientStructs.FFXIV.Client.Game.UI;
|
using FFXIVClientStructs.FFXIV.Client.Game.UI;
|
||||||
@ -22,11 +21,8 @@ using Questionable.Controller.Steps.Interactions;
|
|||||||
using Questionable.Data;
|
using Questionable.Data;
|
||||||
using Questionable.Functions;
|
using Questionable.Functions;
|
||||||
using Questionable.Model;
|
using Questionable.Model;
|
||||||
using Questionable.Model.Common;
|
|
||||||
using Questionable.Model.Gathering;
|
using Questionable.Model.Gathering;
|
||||||
using Questionable.Model.Questing;
|
using Questionable.Model.Questing;
|
||||||
using AethernetShortcut = Questionable.Controller.Steps.Shared.AethernetShortcut;
|
|
||||||
using EAetheryteLocationExtensions = Questionable.Model.Common.EAetheryteLocationExtensions;
|
|
||||||
using Quest = Questionable.Model.Quest;
|
using Quest = Questionable.Model.Quest;
|
||||||
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
|
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
|
||||||
|
|
||||||
@ -634,7 +630,7 @@ internal sealed class InteractionUiController : IDisposable
|
|||||||
}
|
}
|
||||||
|
|
||||||
private unsafe bool HandleDefaultYesNo(AddonSelectYesno* addonSelectYesno, Quest quest,
|
private unsafe bool HandleDefaultYesNo(AddonSelectYesno* addonSelectYesno, Quest quest,
|
||||||
IList<DialogueChoice> dialogueChoices, string actualPrompt)
|
List<DialogueChoice> dialogueChoices, string actualPrompt)
|
||||||
{
|
{
|
||||||
_logger.LogTrace("DefaultYesNo: Choice count: {Count}", dialogueChoices.Count);
|
_logger.LogTrace("DefaultYesNo: Choice count: {Count}", dialogueChoices.Count);
|
||||||
foreach (var dialogueChoice in dialogueChoices)
|
foreach (var dialogueChoice in dialogueChoices)
|
||||||
|
@ -25,7 +25,7 @@ internal sealed class TaskCreator
|
|||||||
var newTasks = scope.ServiceProvider.GetRequiredService<IEnumerable<ITaskFactory>>()
|
var newTasks = scope.ServiceProvider.GetRequiredService<IEnumerable<ITaskFactory>>()
|
||||||
.SelectMany(x =>
|
.SelectMany(x =>
|
||||||
{
|
{
|
||||||
IList<ITask> tasks = x.CreateAllTasks(quest, sequence, step).ToList();
|
List<ITask> tasks = x.CreateAllTasks(quest, sequence, step).ToList();
|
||||||
|
|
||||||
if (tasks.Count > 0 && _logger.IsEnabled(LogLevel.Trace))
|
if (tasks.Count > 0 && _logger.IsEnabled(LogLevel.Trace))
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Dalamud.Interface;
|
using Dalamud.Interface;
|
||||||
using Dalamud.Interface.Colors;
|
using Dalamud.Interface.Colors;
|
||||||
@ -8,7 +9,6 @@ using Dalamud.Interface.Utility.Raii;
|
|||||||
using Dalamud.Plugin;
|
using Dalamud.Plugin;
|
||||||
using Dalamud.Utility;
|
using Dalamud.Utility;
|
||||||
using ImGuiNET;
|
using ImGuiNET;
|
||||||
using LLib;
|
|
||||||
using LLib.ImGui;
|
using LLib.ImGui;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Questionable.External;
|
using Questionable.External;
|
||||||
@ -44,7 +44,7 @@ internal sealed class OneTimeSetupWindow : LWindow
|
|||||||
new Uri("https://github.com/NightmareXIV/MyDalamudPlugins/raw/main/pluginmaster.json")),
|
new Uri("https://github.com/NightmareXIV/MyDalamudPlugins/raw/main/pluginmaster.json")),
|
||||||
];
|
];
|
||||||
|
|
||||||
private static readonly IReadOnlyDictionary<Configuration.ECombatModule, PluginInfo> CombatPlugins = new Dictionary<Configuration.ECombatModule, PluginInfo>
|
private static readonly ReadOnlyDictionary<Configuration.ECombatModule, PluginInfo> CombatPlugins = new Dictionary<Configuration.ECombatModule, PluginInfo>
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
Configuration.ECombatModule.BossMod,
|
Configuration.ECombatModule.BossMod,
|
||||||
|
Loading…
Reference in New Issue
Block a user