diff --git a/client/Configuration.cs b/client/Configuration.cs index de7f12e..dd9bd9b 100644 --- a/client/Configuration.cs +++ b/client/Configuration.cs @@ -7,7 +7,7 @@ public class Configuration : IPluginConfiguration { public int Version { get; set; } = 1; public string ApiKey { get; set; } = string.Empty; - public HashSet BannedTerritories { get; set; } = new(); + public HashSet BannedTerritories { get; set; } = []; public bool DisableTrials = true; public bool DisableDeepDungeon = true; public bool DisableInCutscene = true; diff --git a/client/Messages.cs b/client/Messages.cs index c9a95ab..c98b9e9 100644 --- a/client/Messages.cs +++ b/client/Messages.cs @@ -11,14 +11,15 @@ namespace OrangeGuidanceTomestone; internal class Messages : IDisposable { internal const uint MaxAmount = 20; - internal static readonly string[] VfxPaths = { + internal static readonly string[] VfxPaths = [ "bg/ffxiv/fst_f1/common/vfx/eff/b0941trp1a_o.avfx", "bg/ffxiv/fst_f1/common/vfx/eff/b0941trp1b_o.avfx", "bg/ffxiv/fst_f1/common/vfx/eff/b0941trp1c_o.avfx", "bg/ffxiv/fst_f1/common/vfx/eff/b0941trp1d_o.avfx", "bg/ffxiv/fst_f1/common/vfx/eff/b0941trp1e_o.avfx", "bg/ex2/02_est_e3/common/vfx/eff/b0941trp1f_o.avfx", - }; + "bg/ex4/07_lak_l5/common/vfx/eff/b2640trp1g_o.avfx", + ]; private static string GetPath(IDataManager data, Message message) { var glyph = message.Glyph; @@ -40,8 +41,8 @@ internal class Messages : IDisposable { private Dictionary Current { get; } = new(); private Queue SpawnQueue { get; } = new(); - private HashSet Trials { get; } = new(); - private HashSet DeepDungeons { get; } = new(); + private HashSet Trials { get; } = []; + private HashSet DeepDungeons { get; } = []; private bool CutsceneActive { get { diff --git a/client/OrangeGuidanceTomestone.csproj b/client/OrangeGuidanceTomestone.csproj index 15996b1..a7adc57 100755 --- a/client/OrangeGuidanceTomestone.csproj +++ b/client/OrangeGuidanceTomestone.csproj @@ -61,7 +61,7 @@ - + diff --git a/client/Pack.cs b/client/Pack.cs index 56fbe62..d839f9c 100644 --- a/client/Pack.cs +++ b/client/Pack.cs @@ -6,7 +6,7 @@ namespace OrangeGuidanceTomestone; [Serializable] public class Pack { internal static SemaphoreSlim AllMutex { get; } = new(1, 1); - internal static Pack[] All { get; set; } = Array.Empty(); + internal static Pack[] All { get; set; } = []; public string Name { get; init; } public Guid Id { get; init; } diff --git a/client/Plugin.cs b/client/Plugin.cs index e7dac94..3174a0c 100644 --- a/client/Plugin.cs +++ b/client/Plugin.cs @@ -86,7 +86,7 @@ public class Plugin : IDalamudPlugin { Directory.CreateDirectory(configDir); for (var i = 0; i < Messages.VfxPaths.Length; i++) { var letter = (char) ('a' + i); - var stream = Resourcer.Resource.AsStreamUnChecked($"OrangeGuidanceTomestone.vfx.b0941trp1{letter}_o.avfx"); + var stream = Resourcer.Resource.AsStreamUnChecked($"OrangeGuidanceTomestone.vfx.sign_{letter}.avfx"); var path = Path.Join(configDir, $"sign_{letter}.avfx"); stream.CopyTo(File.Create(path)); } diff --git a/client/PluginUi.cs b/client/PluginUi.cs index b773ea3..c90d232 100644 --- a/client/PluginUi.cs +++ b/client/PluginUi.cs @@ -10,7 +10,7 @@ public class PluginUi : IDisposable { internal Viewer Viewer { get; } internal ViewerButton ViewerButton { get; } - private List<(string, string)> Modals { get; } = new(); + private List<(string, string)> Modals { get; } = []; private Queue ToShow { get; } = new(); internal PluginUi(Plugin plugin) { diff --git a/client/Ui/MainWindow.cs b/client/Ui/MainWindow.cs index 4545776..56456c4 100644 --- a/client/Ui/MainWindow.cs +++ b/client/Ui/MainWindow.cs @@ -13,11 +13,11 @@ internal class MainWindow { internal MainWindow(Plugin plugin) { this.Plugin = plugin; - this.Tabs = new List { + this.Tabs = [ new Write(this.Plugin), new MessageList(this.Plugin), new Settings(this.Plugin), - }; + ]; } internal void Draw() { diff --git a/client/Ui/MainWindowTabs/MessageList.cs b/client/Ui/MainWindowTabs/MessageList.cs index c53234d..5273f11 100644 --- a/client/Ui/MainWindowTabs/MessageList.cs +++ b/client/Ui/MainWindowTabs/MessageList.cs @@ -14,7 +14,7 @@ internal class MessageList : ITab { private SortMode Sort { get; set; } private SemaphoreSlim MessagesMutex { get; } = new(1, 1); - private List Messages { get; } = new(); + private List Messages { get; } = []; internal MessageList(Plugin plugin) { this.Plugin = plugin; @@ -49,7 +49,7 @@ internal class MessageList : ITab { } private void ShowList() { - ImGui.TextUnformatted($"Messages: {this.Messages.Count:N0} / {Messages.MaxAmount + this.Plugin.Ui.MainWindow.ExtraMessages:N0}"); + ImGui.TextUnformatted($"Messages: {this.Messages.Count:N0} / {OrangeGuidanceTomestone.Messages.MaxAmount + this.Plugin.Ui.MainWindow.ExtraMessages:N0}"); ImGui.Separator(); diff --git a/client/Ui/MainWindowTabs/Write.cs b/client/Ui/MainWindowTabs/Write.cs index 666b0ae..0a6527a 100644 --- a/client/Ui/MainWindowTabs/Write.cs +++ b/client/Ui/MainWindowTabs/Write.cs @@ -21,7 +21,7 @@ internal class Write : ITab { private (int, int) _word2 = (-1, -1); private int _glyph; - private List GlyphImages { get; } = new(); + private List GlyphImages { get; } = []; private void LoadSignImages() { for (var i = 0; i < Messages.VfxPaths.Length; i++) { diff --git a/client/vfx/b0941trp1a_o.avfx b/client/vfx/sign_a.avfx similarity index 100% rename from client/vfx/b0941trp1a_o.avfx rename to client/vfx/sign_a.avfx diff --git a/client/vfx/b0941trp1b_o.avfx b/client/vfx/sign_b.avfx similarity index 100% rename from client/vfx/b0941trp1b_o.avfx rename to client/vfx/sign_b.avfx diff --git a/client/vfx/b0941trp1c_o.avfx b/client/vfx/sign_c.avfx similarity index 100% rename from client/vfx/b0941trp1c_o.avfx rename to client/vfx/sign_c.avfx diff --git a/client/vfx/b0941trp1d_o.avfx b/client/vfx/sign_d.avfx similarity index 100% rename from client/vfx/b0941trp1d_o.avfx rename to client/vfx/sign_d.avfx diff --git a/client/vfx/b0941trp1e_o.avfx b/client/vfx/sign_e.avfx similarity index 100% rename from client/vfx/b0941trp1e_o.avfx rename to client/vfx/sign_e.avfx diff --git a/client/vfx/b0941trp1f_o.avfx b/client/vfx/sign_f.avfx similarity index 100% rename from client/vfx/b0941trp1f_o.avfx rename to client/vfx/sign_f.avfx diff --git a/client/vfx/sign_g.avfx b/client/vfx/sign_g.avfx new file mode 100755 index 0000000..2aa9360 Binary files /dev/null and b/client/vfx/sign_g.avfx differ