From c60c929502100887fe6df1337424fbac67d412b3 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 18 Jun 2024 01:06:37 +0200 Subject: [PATCH] Minor style adjustments --- Gearsetter/GameData/EBaseParam.cs | 51 ++++++++++---------- Gearsetter/GearsetterPlugin.cs | 2 +- Gearsetter/Model/EquipmentStats.cs | 43 ++++++++--------- Gearsetter/Windows/EquipmentBrowserWindow.cs | 1 + 4 files changed, 48 insertions(+), 49 deletions(-) diff --git a/Gearsetter/GameData/EBaseParam.cs b/Gearsetter/GameData/EBaseParam.cs index a28d8d5..88d81d3 100644 --- a/Gearsetter/GameData/EBaseParam.cs +++ b/Gearsetter/GameData/EBaseParam.cs @@ -1,33 +1,32 @@ -namespace Gearsetter.GameData +namespace Gearsetter.GameData; + +internal enum EBaseParam : byte { - internal enum EBaseParam : byte - { - Strength = 1, - Dexterity = 2, - Vitality = 3, - Intelligence = 4, - Mind = 5, - Piety = 6, + Strength = 1, + Dexterity = 2, + Vitality = 3, + Intelligence = 4, + Mind = 5, + Piety = 6, - GP = 10, - CP = 11, + GP = 10, + CP = 11, - DamagePhys = 12, - DamageMag = 13, + DamagePhys = 12, + DamageMag = 13, - DefensePhys = 21, - DefenseMag = 24, + DefensePhys = 21, + DefenseMag = 24, - Tenacity = 19, - Crit = 27, - DirectHit = 22, - Determination = 44, - SpellSpeed = 46, - SkillSpeed = 23, + Tenacity = 19, + Crit = 27, + DirectHit = 22, + Determination = 44, + SpellSpeed = 46, + SkillSpeed = 23, - Craftsmanship = 70, - Control = 71, - Gathering = 72, - Perception = 73, - } + Craftsmanship = 70, + Control = 71, + Gathering = 72, + Perception = 73, } diff --git a/Gearsetter/GearsetterPlugin.cs b/Gearsetter/GearsetterPlugin.cs index 7ee2c63..c12605c 100644 --- a/Gearsetter/GearsetterPlugin.cs +++ b/Gearsetter/GearsetterPlugin.cs @@ -264,7 +264,7 @@ public sealed class GearsetterPlugin : IDalamudPlugin }) .Take(gearsetItem.Length) .ToList(); - _pluginLog.Information( + _pluginLog.Debug( $"{equipSlotCategory}: {string.Join(" ", currentItems.Select(x => $"{x?.ItemId}|{x?.Hq}"))}"); foreach (var currentItem in currentItems) { diff --git a/Gearsetter/Model/EquipmentStats.cs b/Gearsetter/Model/EquipmentStats.cs index 72be798..3b36aea 100644 --- a/Gearsetter/Model/EquipmentStats.cs +++ b/Gearsetter/Model/EquipmentStats.cs @@ -3,33 +3,32 @@ using System.Linq; using Gearsetter.GameData; using Lumina.Excel.GeneratedSheets; -namespace Gearsetter.Model -{ - internal sealed class EquipmentStats - { - private readonly Dictionary _values; +namespace Gearsetter.Model; - public EquipmentStats(Item item, bool hq) +internal sealed class EquipmentStats +{ + private readonly Dictionary _values; + + public EquipmentStats(Item item, bool hq) + { + _values = item.UnkData59.Where(x => x.BaseParam > 0) + .ToDictionary(x => (EBaseParam)x.BaseParam, x => x.BaseParamValue); + if (hq) { - _values = item.UnkData59.Where(x => x.BaseParam > 0) - .ToDictionary(x => (EBaseParam)x.BaseParam, x => x.BaseParamValue); - if (hq) + foreach (var hqstat in item.UnkData73.Select(x => + ((EBaseParam)x.BaseParamSpecial, x.BaseParamValueSpecial))) { - foreach (var hqstat in item.UnkData73.Select(x => - ((EBaseParam)x.BaseParamSpecial, x.BaseParamValueSpecial))) - { - if (_values.TryGetValue(hqstat.Item1, out var stat)) - _values[hqstat.Item1] = (short)(stat + hqstat.BaseParamValueSpecial); - else - _values[hqstat.Item1] = hqstat.BaseParamValueSpecial; - } + if (_values.TryGetValue(hqstat.Item1, out var stat)) + _values[hqstat.Item1] = (short)(stat + hqstat.BaseParamValueSpecial); + else + _values[hqstat.Item1] = hqstat.BaseParamValueSpecial; } } + } - public short Get(EBaseParam param) - { - _values.TryGetValue(param, out short v); - return v; - } + public short Get(EBaseParam param) + { + _values.TryGetValue(param, out short v); + return v; } } diff --git a/Gearsetter/Windows/EquipmentBrowserWindow.cs b/Gearsetter/Windows/EquipmentBrowserWindow.cs index 0dcc8d5..e11355b 100644 --- a/Gearsetter/Windows/EquipmentBrowserWindow.cs +++ b/Gearsetter/Windows/EquipmentBrowserWindow.cs @@ -154,6 +154,7 @@ internal sealed class EquipmentBrowserWindow : Window 2 => ImGuiColors.ParsedGreen, 3 => ImGuiColors.ParsedBlue, 4 => ImGuiColors.ParsedPurple, + 7 => ImGuiColors.ParsedPink, _ => null, };