From 9255f2bb2bc5bca2092ef8c953f08acfc44ee834 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sat, 3 Jun 2023 00:04:30 +0200 Subject: [PATCH] Some readonlys. --- Penumbra.GameData/Structs/CharacterArmor.cs | 6 +++--- Penumbra.GameData/Structs/CharacterWeapon.cs | 4 ++-- Penumbra/UI/AdvancedWindow/ModEditWindow.Files.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Penumbra.GameData/Structs/CharacterArmor.cs b/Penumbra.GameData/Structs/CharacterArmor.cs index eda75810..f44ae5e6 100644 --- a/Penumbra.GameData/Structs/CharacterArmor.cs +++ b/Penumbra.GameData/Structs/CharacterArmor.cs @@ -28,13 +28,13 @@ public struct CharacterArmor : IEquatable Stain = stain; } - public CharacterArmor With(StainId stain) + public readonly CharacterArmor With(StainId stain) => new(Set, Variant, stain); - public CharacterWeapon ToWeapon() + public readonly CharacterWeapon ToWeapon() => new(Set, 0, Variant, Stain); - public CharacterWeapon ToWeapon(StainId stain) + public readonly CharacterWeapon ToWeapon(StainId stain) => new(Set, 0, Variant, stain); public override string ToString() diff --git a/Penumbra.GameData/Structs/CharacterWeapon.cs b/Penumbra.GameData/Structs/CharacterWeapon.cs index 188a163d..7b40f55f 100644 --- a/Penumbra.GameData/Structs/CharacterWeapon.cs +++ b/Penumbra.GameData/Structs/CharacterWeapon.cs @@ -40,10 +40,10 @@ public struct CharacterWeapon : IEquatable Stain = (StainId)(value >> 48); } - public CharacterArmor ToArmor() + public readonly CharacterArmor ToArmor() => new(Set, (byte)Variant, Stain); - public CharacterArmor ToArmor(StainId stain) + public readonly CharacterArmor ToArmor(StainId stain) => new(Set, (byte)Variant, stain); public static readonly CharacterWeapon Empty = new(0, 0, 0, 0); diff --git a/Penumbra/UI/AdvancedWindow/ModEditWindow.Files.cs b/Penumbra/UI/AdvancedWindow/ModEditWindow.Files.cs index 09578a69..fb1e59aa 100644 --- a/Penumbra/UI/AdvancedWindow/ModEditWindow.Files.cs +++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.Files.cs @@ -293,7 +293,7 @@ public partial class ModEditWindow if (_selectedFiles.Count == 0) tt += "\n\nNo files selected."; else if (!active) - tt += $"\n\nHold {_config.DeleteModModifier.ToString()} to delete."; + tt += $"\n\nHold {_config.DeleteModModifier} to delete."; if (ImGuiUtil.DrawDisabledButton("Delete Selected Files", Vector2.Zero, tt, _selectedFiles.Count == 0 || !active)) _editor.FileEditor.DeleteFiles(_editor.Mod!, _editor.Option!, _editor.Files.Available.Where(_selectedFiles.Contains));