From 843cc0bdd3be6d4eee47bb94669d85465e10cae1 Mon Sep 17 00:00:00 2001 From: Anna Date: Wed, 12 Jun 2024 14:16:53 -0400 Subject: [PATCH] feat: add new glyph --- client/Configuration.cs | 2 +- client/Messages.cs | 9 +++++---- client/OrangeGuidanceTomestone.csproj | 2 +- client/Pack.cs | 2 +- client/Plugin.cs | 2 +- client/PluginUi.cs | 2 +- client/Ui/MainWindow.cs | 4 ++-- client/Ui/MainWindowTabs/MessageList.cs | 4 ++-- client/Ui/MainWindowTabs/Write.cs | 2 +- client/vfx/{b0941trp1a_o.avfx => sign_a.avfx} | Bin client/vfx/{b0941trp1b_o.avfx => sign_b.avfx} | Bin client/vfx/{b0941trp1c_o.avfx => sign_c.avfx} | Bin client/vfx/{b0941trp1d_o.avfx => sign_d.avfx} | Bin client/vfx/{b0941trp1e_o.avfx => sign_e.avfx} | Bin client/vfx/{b0941trp1f_o.avfx => sign_f.avfx} | Bin client/vfx/sign_g.avfx | Bin 0 -> 18392 bytes 16 files changed, 15 insertions(+), 14 deletions(-) rename client/vfx/{b0941trp1a_o.avfx => sign_a.avfx} (100%) rename client/vfx/{b0941trp1b_o.avfx => sign_b.avfx} (100%) rename client/vfx/{b0941trp1c_o.avfx => sign_c.avfx} (100%) rename client/vfx/{b0941trp1d_o.avfx => sign_d.avfx} (100%) rename client/vfx/{b0941trp1e_o.avfx => sign_e.avfx} (100%) rename client/vfx/{b0941trp1f_o.avfx => sign_f.avfx} (100%) create mode 100755 client/vfx/sign_g.avfx 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 0000000000000000000000000000000000000000..2aa9360d41458ec99b3f2f21854c0851f3d1da82 GIT binary patch literal 18392 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 literal 0 HcmV?d00001