Code formatting fixes
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
using Lumina.Excel.GeneratedSheets;
|
|
||||||
using Lumina.Excel;
|
|
||||||
using Dalamud;
|
using Dalamud;
|
||||||
|
using Lumina.Excel;
|
||||||
|
using Lumina.Excel.GeneratedSheets;
|
||||||
|
|
||||||
namespace Craftimizer.Plugin;
|
namespace Craftimizer.Plugin;
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
using Dalamud.Data;
|
using Dalamud.Data;
|
||||||
using Dalamud.Game.ClientState.Objects;
|
|
||||||
using Dalamud.Game.ClientState;
|
|
||||||
using Dalamud.Game.Gui;
|
|
||||||
using Dalamud.Game;
|
using Dalamud.Game;
|
||||||
|
using Dalamud.Game.ClientState;
|
||||||
|
using Dalamud.Game.ClientState.Conditions;
|
||||||
|
using Dalamud.Game.ClientState.Objects;
|
||||||
|
using Dalamud.Game.Command;
|
||||||
|
using Dalamud.Game.Gui;
|
||||||
|
using Dalamud.Interface.Windowing;
|
||||||
using Dalamud.IoC;
|
using Dalamud.IoC;
|
||||||
using Dalamud.Plugin;
|
using Dalamud.Plugin;
|
||||||
using Dalamud.Game.ClientState.Conditions;
|
|
||||||
using Dalamud.Game.Command;
|
|
||||||
using Dalamud.Interface.Windowing;
|
|
||||||
|
|
||||||
namespace Craftimizer.Plugin;
|
namespace Craftimizer.Plugin;
|
||||||
|
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
using ImGuiScene;
|
using Craftimizer.Simulator;
|
||||||
using Dalamud.Utility;
|
|
||||||
using Lumina.Excel.GeneratedSheets;
|
|
||||||
using System.Linq;
|
|
||||||
using Craftimizer.Simulator.Actions;
|
using Craftimizer.Simulator.Actions;
|
||||||
using Action = Lumina.Excel.GeneratedSheets.Action;
|
|
||||||
using Dalamud.Game.Text.SeStringHandling.Payloads;
|
using Dalamud.Game.Text.SeStringHandling.Payloads;
|
||||||
|
using Dalamud.Utility;
|
||||||
|
using ImGuiScene;
|
||||||
|
using Lumina.Excel.GeneratedSheets;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Numerics;
|
||||||
|
using System.Text;
|
||||||
|
using Action = Lumina.Excel.GeneratedSheets.Action;
|
||||||
using ClassJob = Craftimizer.Simulator.ClassJob;
|
using ClassJob = Craftimizer.Simulator.ClassJob;
|
||||||
using Condition = Craftimizer.Simulator.Condition;
|
using Condition = Craftimizer.Simulator.Condition;
|
||||||
using Craftimizer.Simulator;
|
|
||||||
using System.Text;
|
|
||||||
using System.Numerics;
|
|
||||||
using System.Globalization;
|
|
||||||
|
|
||||||
namespace Craftimizer.Plugin;
|
namespace Craftimizer.Plugin;
|
||||||
|
|
||||||
@@ -293,7 +293,7 @@ internal static class EffectUtils
|
|||||||
public static ushort GetIconId(this EffectType me, int strength)
|
public static ushort GetIconId(this EffectType me, int strength)
|
||||||
{
|
{
|
||||||
var status = me.Status();
|
var status = me.Status();
|
||||||
uint iconId = status.Icon;
|
var iconId = status.Icon;
|
||||||
if (status.MaxStacks != 0)
|
if (status.MaxStacks != 0)
|
||||||
iconId += (uint)Math.Clamp(strength, 1, status.MaxStacks) - 1;
|
iconId += (uint)Math.Clamp(strength, 1, status.MaxStacks) - 1;
|
||||||
return (ushort)iconId;
|
return (ushort)iconId;
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
using Craftimizer.Simulator.Actions;
|
using Craftimizer.Plugin;
|
||||||
using Dalamud.Hooking;
|
using Dalamud.Hooking;
|
||||||
using Dalamud.Logging;
|
|
||||||
using Dalamud.Utility.Signatures;
|
|
||||||
using FFXIVClientStructs.FFXIV.Client.Game;
|
using FFXIVClientStructs.FFXIV.Client.Game;
|
||||||
using System;
|
using System;
|
||||||
using ActionType = Craftimizer.Simulator.Actions.ActionType;
|
using ActionType = Craftimizer.Simulator.Actions.ActionType;
|
||||||
using CSActionType = FFXIVClientStructs.FFXIV.Client.Game.ActionType;
|
|
||||||
using Condition = Craftimizer.Simulator.Condition;
|
|
||||||
using Craftimizer.Plugin;
|
|
||||||
using ActionUtils = Craftimizer.Plugin.ActionUtils;
|
using ActionUtils = Craftimizer.Plugin.ActionUtils;
|
||||||
|
using CSActionType = FFXIVClientStructs.FFXIV.Client.Game.ActionType;
|
||||||
|
|
||||||
namespace Craftimizer.Utils;
|
namespace Craftimizer.Utils;
|
||||||
|
|
||||||
@@ -35,7 +31,8 @@ public sealed unsafe class Hooks : IDisposable
|
|||||||
if (canCast && ret && (actionType == CSActionType.CraftAction || actionType == CSActionType.Spell))
|
if (canCast && ret && (actionType == CSActionType.CraftAction || actionType == CSActionType.Spell))
|
||||||
{
|
{
|
||||||
var classJob = ClassJobUtils.GetClassJobFromIdx((byte)(Service.ClientState.LocalPlayer?.ClassJob.Id ?? 0));
|
var classJob = ClassJobUtils.GetClassJobFromIdx((byte)(Service.ClientState.LocalPlayer?.ClassJob.Id ?? 0));
|
||||||
if (classJob != null) {
|
if (classJob != null)
|
||||||
|
{
|
||||||
var simActionType = ActionUtils.GetActionTypeFromId(actionId, classJob.Value, actionType == CSActionType.CraftAction);
|
var simActionType = ActionUtils.GetActionTypeFromId(actionId, classJob.Value, actionType == CSActionType.CraftAction);
|
||||||
if (simActionType != null)
|
if (simActionType != null)
|
||||||
OnActionUsed?.Invoke(simActionType.Value);
|
OnActionUsed?.Invoke(simActionType.Value);
|
||||||
|
|||||||
@@ -283,7 +283,8 @@ public unsafe class CraftingLog : Window
|
|||||||
ImGui.TableNextRow();
|
ImGui.TableNextRow();
|
||||||
|
|
||||||
SimulationState? state = null;
|
SimulationState? state = null;
|
||||||
if (CharacterCannotCraftReason == CannotCraftReason.OK) {
|
if (CharacterCannotCraftReason == CannotCraftReason.OK)
|
||||||
|
{
|
||||||
state = new(CharacterSimulationInput);
|
state = new(CharacterSimulationInput);
|
||||||
foreach (var action in macro.Actions)
|
foreach (var action in macro.Actions)
|
||||||
(_, state) = simulation.Execute(state.Value, action);
|
(_, state) = simulation.Execute(state.Value, action);
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
using Dalamud.Interface.Windowing;
|
|
||||||
using Dalamud.Interface;
|
|
||||||
using ImGuiNET;
|
|
||||||
using System.Numerics;
|
|
||||||
using System;
|
|
||||||
using Craftimizer.Solver.Crafty;
|
using Craftimizer.Solver.Crafty;
|
||||||
|
using Dalamud.Interface;
|
||||||
|
using Dalamud.Interface.Windowing;
|
||||||
|
using ImGuiNET;
|
||||||
|
using System;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
namespace Craftimizer.Plugin.Windows;
|
namespace Craftimizer.Plugin.Windows;
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
using Craftimizer.Simulator.Actions;
|
|
||||||
using Craftimizer.Simulator;
|
using Craftimizer.Simulator;
|
||||||
using Dalamud.Interface.Windowing;
|
using Craftimizer.Simulator.Actions;
|
||||||
using ImGuiNET;
|
|
||||||
using System.Numerics;
|
|
||||||
using Dalamud.Interface;
|
|
||||||
using Dalamud.Utility;
|
|
||||||
using System;
|
|
||||||
using ImGuiScene;
|
|
||||||
using Dalamud.Interface.Components;
|
|
||||||
using System.Linq;
|
|
||||||
using Dalamud.Game.Text;
|
using Dalamud.Game.Text;
|
||||||
|
using Dalamud.Interface;
|
||||||
|
using Dalamud.Interface.Components;
|
||||||
|
using Dalamud.Interface.Windowing;
|
||||||
|
using Dalamud.Utility;
|
||||||
|
using ImGuiNET;
|
||||||
|
using ImGuiScene;
|
||||||
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
namespace Craftimizer.Plugin.Windows;
|
namespace Craftimizer.Plugin.Windows;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user