From 0fa4ec8dce5de55a4226fd9316f464bacb2bf948 Mon Sep 17 00:00:00 2001 From: Lusamine <30205550+Lusamine@users.noreply.github.com> Date: Thu, 23 Feb 2023 10:56:54 -0600 Subject: [PATCH] Fully update button naming/localization for propagating SV raids Standardizes capitalization of "raid" in the editor and updates shortcuts to indicate holding Shift to propagate seed. Closes #3807 --- .../Substructures/Gen9/RaidSpawnList9.cs | 6 ++--- PKHeX.WinForms/Resources/text/lang_de.txt | 2 +- PKHeX.WinForms/Resources/text/lang_en.txt | 2 +- PKHeX.WinForms/Resources/text/lang_es.txt | 2 +- PKHeX.WinForms/Resources/text/lang_fr.txt | 2 +- PKHeX.WinForms/Resources/text/lang_it.txt | 2 +- PKHeX.WinForms/Resources/text/lang_ja.txt | 2 +- PKHeX.WinForms/Resources/text/lang_ko.txt | 2 +- PKHeX.WinForms/Resources/text/lang_zh.txt | 2 +- PKHeX.WinForms/Resources/text/lang_zh2.txt | 2 +- PKHeX.WinForms/Resources/text/shortcuts.txt | 15 ++++++----- .../Save Editors/Gen9/SAV_Raid9.Designer.cs | 26 +++++++++---------- 12 files changed, 34 insertions(+), 31 deletions(-) diff --git a/PKHeX.Core/Saves/Substructures/Gen9/RaidSpawnList9.cs b/PKHeX.Core/Saves/Substructures/Gen9/RaidSpawnList9.cs index b8273c88b..108d631a1 100644 --- a/PKHeX.Core/Saves/Substructures/Gen9/RaidSpawnList9.cs +++ b/PKHeX.Core/Saves/Substructures/Gen9/RaidSpawnList9.cs @@ -106,7 +106,7 @@ public uint SpawnPointID set => WriteUInt32LittleEndian(Data.AsSpan(Offset + 0x0C), value); } - [Category(General), Description("RNG Seed (32bit) for fetching the Raid data table and generating the raid."), TypeConverter(typeof(TypeConverterU32))] + [Category(General), Description("RNG Seed (32bit) for fetching the raid data table and generating the raid."), TypeConverter(typeof(TypeConverterU32))] public uint Seed { get => ReadUInt32LittleEndian(Data.AsSpan(Offset + 0x10)); @@ -120,14 +120,14 @@ public uint Unused set => WriteUInt32LittleEndian(Data.AsSpan(Offset + 0x14), value); } - [Category(General), Description("Indicates the source of the Raid encounter data and rewards.")] + [Category(General), Description("Indicates the source of the raid encounter data and rewards.")] public TeraRaidContentType Content { get => (TeraRaidContentType)ReadUInt32LittleEndian(Data.AsSpan(Offset + 0x18)); set => WriteUInt32LittleEndian(Data.AsSpan(Offset + 0x18), (uint)value); } - [Category(Misc), Description("Has player already collected the League Points for this Raid?")] + [Category(Misc), Description("Has player already collected the League Points for this raid?")] public bool IsClaimedLeaguePoints { get => ReadUInt32LittleEndian(Data.AsSpan(Offset + 0x1C)) != 0; diff --git a/PKHeX.WinForms/Resources/text/lang_de.txt b/PKHeX.WinForms/Resources/text/lang_de.txt index 93d1b9f37..8fe9707b0 100644 --- a/PKHeX.WinForms/Resources/text/lang_de.txt +++ b/PKHeX.WinForms/Resources/text/lang_de.txt @@ -1296,7 +1296,7 @@ SAV_Raid8.B_Cancel=Abbrechen SAV_Raid8.B_Save=Speichern SAV_Raid9.B_Cancel=Abbrechen SAV_Raid9.B_Save=Speichern -SAV_Raid9.B_Star6=Alle 6-Sterne +SAV_Raid9.B_CopyToOthers=Copy to Other Raids SAV_Raid9.L_SeedCurrent=Aktueller Seed: SAV_Raid9.L_SeedTomorrow=Morgen: SAV_RaidSevenStar9.B_Cancel=Abbrechen diff --git a/PKHeX.WinForms/Resources/text/lang_en.txt b/PKHeX.WinForms/Resources/text/lang_en.txt index b08600e49..a8ac2ca1c 100644 --- a/PKHeX.WinForms/Resources/text/lang_en.txt +++ b/PKHeX.WinForms/Resources/text/lang_en.txt @@ -1292,7 +1292,7 @@ SAV_Raid8.B_Cancel=Cancel SAV_Raid8.B_Save=Save SAV_Raid9.B_Cancel=Cancel SAV_Raid9.B_Save=Save -SAV_Raid9.B_Star6=Set All 6-Star +SAV_Raid9.B_CopyToOthers=Copy to Other Raids SAV_Raid9.L_SeedCurrent=Current Seed: SAV_Raid9.L_SeedTomorrow=Tomorrow: SAV_RaidSevenStar9.B_Cancel=Cancel diff --git a/PKHeX.WinForms/Resources/text/lang_es.txt b/PKHeX.WinForms/Resources/text/lang_es.txt index e46e02286..2910a8a7e 100644 --- a/PKHeX.WinForms/Resources/text/lang_es.txt +++ b/PKHeX.WinForms/Resources/text/lang_es.txt @@ -1292,7 +1292,7 @@ SAV_Raid8.B_Cancel=Cancelar SAV_Raid8.B_Save=Guardar SAV_Raid9.B_Cancel=Cancelar SAV_Raid9.B_Save=Guardar -SAV_Raid9.B_Star6=Todas 6 estrellas +SAV_Raid9.B_CopyToOthers=Copy to Other Raids SAV_Raid9.L_SeedCurrent=Semilla actual: SAV_Raid9.L_SeedTomorrow=Mañana: SAV_RaidSevenStar9.B_Cancel=Cancel diff --git a/PKHeX.WinForms/Resources/text/lang_fr.txt b/PKHeX.WinForms/Resources/text/lang_fr.txt index 30ac750b9..c3da2e6e8 100644 --- a/PKHeX.WinForms/Resources/text/lang_fr.txt +++ b/PKHeX.WinForms/Resources/text/lang_fr.txt @@ -1296,7 +1296,7 @@ SAV_Raid8.B_Cancel=Annuler SAV_Raid8.B_Save=Sauvegarder SAV_Raid9.B_Cancel=Annuler SAV_Raid9.B_Save=Sauvegarder -SAV_Raid9.B_Star6=Tous les mettres à 6-étoiles +SAV_Raid9.B_CopyToOthers=Copy to Other Raids SAV_Raid9.L_SeedCurrent=Seed actuelle : SAV_Raid9.L_SeedTomorrow=Demain : SAV_RaidSevenStar9.B_Cancel=Cancel diff --git a/PKHeX.WinForms/Resources/text/lang_it.txt b/PKHeX.WinForms/Resources/text/lang_it.txt index 1a9b7d7aa..4bef26275 100644 --- a/PKHeX.WinForms/Resources/text/lang_it.txt +++ b/PKHeX.WinForms/Resources/text/lang_it.txt @@ -1303,7 +1303,7 @@ SAV_Raid8.B_Cancel=Annulla SAV_Raid8.B_Save=Salva SAV_Raid9.B_Cancel=Annulla SAV_Raid9.B_Save=Salva -SAV_Raid9.B_Star6=Imposta tutto a 6 Stelle +SAV_Raid9.B_CopyToOthers=Copy to Other Raids SAV_Raid9.L_SeedCurrent=Seed odierno: SAV_Raid9.L_SeedTomorrow=Seed di domani: SAV_RaidSevenStar9.B_Cancel=Annulla diff --git a/PKHeX.WinForms/Resources/text/lang_ja.txt b/PKHeX.WinForms/Resources/text/lang_ja.txt index 0f3eb5e8f..7903f679e 100644 --- a/PKHeX.WinForms/Resources/text/lang_ja.txt +++ b/PKHeX.WinForms/Resources/text/lang_ja.txt @@ -1296,7 +1296,7 @@ SAV_Raid8.B_Cancel=キャンセル SAV_Raid8.B_Save=Save SAV_Raid9.B_Cancel=キャンセル SAV_Raid9.B_Save=Save -SAV_Raid9.B_Star6=Set All 6-Star +SAV_Raid9.B_CopyToOthers=Copy to Other Raids SAV_Raid9.L_SeedCurrent=Current Seed: SAV_Raid9.L_SeedTomorrow=Tomorrow: SAV_RaidSevenStar9.B_Cancel=キャンセル diff --git a/PKHeX.WinForms/Resources/text/lang_ko.txt b/PKHeX.WinForms/Resources/text/lang_ko.txt index 286d33e3c..5cf979bf8 100644 --- a/PKHeX.WinForms/Resources/text/lang_ko.txt +++ b/PKHeX.WinForms/Resources/text/lang_ko.txt @@ -1292,7 +1292,7 @@ SAV_Raid8.B_Cancel=취소 SAV_Raid8.B_Save=저장 SAV_Raid9.B_Cancel=Cancel SAV_Raid9.B_Save=Save -SAV_Raid9.B_Star6=Set All 6-Star +SAV_Raid9.B_CopyToOthers=Copy to Other Raids SAV_Raid9.L_SeedCurrent=Current Seed: SAV_Raid9.L_SeedTomorrow=Tomorrow: SAV_RaidSevenStar9.B_Cancel=Cancel diff --git a/PKHeX.WinForms/Resources/text/lang_zh.txt b/PKHeX.WinForms/Resources/text/lang_zh.txt index 23a7b644b..0670a5f9b 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh.txt @@ -1296,7 +1296,7 @@ SAV_Raid8.B_Cancel=取消 SAV_Raid8.B_Save=保存 SAV_Raid9.B_Cancel=取消 SAV_Raid9.B_Save=保存 -SAV_Raid9.B_Star6=设置成全部6星 +SAV_Raid9.B_CopyToOthers=Copy to Other Raids SAV_Raid9.L_SeedCurrent=当前Seed: SAV_Raid9.L_SeedTomorrow=明天: SAV_RaidSevenStar9.B_Cancel=取消 diff --git a/PKHeX.WinForms/Resources/text/lang_zh2.txt b/PKHeX.WinForms/Resources/text/lang_zh2.txt index 13d09c14f..d18acb08b 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh2.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh2.txt @@ -1293,7 +1293,7 @@ SAV_Raid8.B_Cancel=取消 SAV_Raid8.B_Save=儲存 SAV_Raid9.B_Cancel=取消 SAV_Raid9.B_Save=儲存 -SAV_Raid9.B_Star6=全部設爲6星 +SAV_Raid9.B_CopyToOthers=Copy to Other Raids SAV_Raid9.L_SeedCurrent=現時Seed: SAV_Raid9.L_SeedTomorrow=明天: SAV_RaidSevenStar9.B_Cancel=取消 diff --git a/PKHeX.WinForms/Resources/text/shortcuts.txt b/PKHeX.WinForms/Resources/text/shortcuts.txt index 3255752d0..718701e71 100644 --- a/PKHeX.WinForms/Resources/text/shortcuts.txt +++ b/PKHeX.WinForms/Resources/text/shortcuts.txt @@ -1,4 +1,4 @@ -If you are having issues viewing certain symbols/text: Options -> Unicode +If you are having issues viewing certain symbols/text: Options -> Unicode // Main Window @@ -95,15 +95,18 @@ Doubleclick on the Party or Battle Box label to export Showdown/Smogon Set (Team // Misc Editors RIBBONS: -- Shift-Click the Give All Button to set all legal Ribbons. -- Shift-Click the Remove All Button to remove all illegal Ribbons. +- Shift-Click the Give All button to set all legal Ribbons. +- Shift-Click the Remove All button to remove all illegal Ribbons. POKEPUFF: -- Control Click the All Button to give the best Pokepuffs. -- Control Click the Sort Button to sort in reverse. +- Control Click the All button to give the best Pokepuffs. +- Control Click the Sort button to sort in reverse. MYSTERY GIFT: - Alt-Click QR to import from QR image. -TRAINER INFO (GO PIKACHU/EEVEE) +TRAINER INFO (GO PIKACHU/EEVEE): - Drop Go Park entity file (gp1) to import to selected slot. + +TERA RAIDS (SCARLET/VIOLET): +- Shift-Click the Copy to Other Raids button to copy the Seed as well as the Content. diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Raid9.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Raid9.Designer.cs index 7892464b0..9a32f93af 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Raid9.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Raid9.Designer.cs @@ -36,7 +36,7 @@ private void InitializeComponent() this.TB_SeedToday = new System.Windows.Forms.TextBox(); this.L_SeedCurrent = new System.Windows.Forms.Label(); this.L_SeedTomorrow = new System.Windows.Forms.Label(); - this.B_Star6 = new System.Windows.Forms.Button(); + this.B_CopyToOthers = new System.Windows.Forms.Button(); this.SuspendLayout(); // // B_Cancel @@ -133,24 +133,24 @@ private void InitializeComponent() this.L_SeedTomorrow.Text = "Tomorrow:"; this.L_SeedTomorrow.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // B_Star6 + // B_CopyToOthers // - this.B_Star6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.B_Star6.Location = new System.Drawing.Point(152, 8); - this.B_Star6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.B_Star6.Name = "B_Star6"; - this.B_Star6.Size = new System.Drawing.Size(224, 24); - this.B_Star6.TabIndex = 20; - this.B_Star6.Text = "Copy to Other Raids"; - this.B_Star6.UseVisualStyleBackColor = true; - this.B_Star6.Click += new System.EventHandler(this.B_CopyToOthers_Click); + this.B_CopyToOthers.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.B_CopyToOthers.Location = new System.Drawing.Point(152, 8); + this.B_CopyToOthers.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.B_CopyToOthers.Name = "B_CopyToOthers"; + this.B_CopyToOthers.Size = new System.Drawing.Size(224, 24); + this.B_CopyToOthers.TabIndex = 20; + this.B_CopyToOthers.Text = "Copy to Other Raids"; + this.B_CopyToOthers.UseVisualStyleBackColor = true; + this.B_CopyToOthers.Click += new System.EventHandler(this.B_CopyToOthers_Click); // // SAV_Raid9 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(384, 370); - this.Controls.Add(this.B_Star6); + this.Controls.Add(this.B_CopyToOthers); this.Controls.Add(this.L_SeedTomorrow); this.Controls.Add(this.L_SeedCurrent); this.Controls.Add(this.TB_SeedTomorrow); @@ -183,6 +183,6 @@ private void InitializeComponent() private System.Windows.Forms.TextBox TB_SeedToday; private System.Windows.Forms.Label L_SeedCurrent; private System.Windows.Forms.Label L_SeedTomorrow; - private System.Windows.Forms.Button B_Star6; + private System.Windows.Forms.Button B_CopyToOthers; } }