only keep trainer related stuff under override trainer

fix format check (Thanks @sora10pls)
architdate · Oct 9, 2020 · 9f93476 · 9f93476
1 parent dfa60e0
commit 9f93476
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/PKHeX.Core.AutoMod/AutoMod/RegenTemplate.cs b/PKHeX.Core.AutoMod/AutoMod/RegenTemplate.cs
@@ -120,6 +120,7 @@ private void LoadExtraInstructions(List<string> lines)
                         break;
                     case "OTGender":
                         OT_Gender = value == "Female" || value == "F" ? 1 : 0;
+                        OverrideTrainer = true;
                         break;
                     default:
                         continue;
@@ -148,18 +149,18 @@ public void GetRegenLines(List<string> ShowdownSetLines)
             var movesets = movesetgroup == null ? new List<string>() : movesetgroup.ToList();
             var pokedata = splitList.FirstOrDefault(x => !x.Key).Where(x => !x.StartsWith("Shiny:")).ToList();
 
+            var shinyval = "Yes";
+            if (Ball != Ball.None) pokedata.Add($"Ball: {Ball} Ball");
+            if (ShinyType == Core.Shiny.AlwaysStar) shinyval = "Star";
+            if (ShinyType == Core.Shiny.AlwaysSquare) shinyval = "Square";
+            if (Shiny) pokedata.Add($"Shiny: {shinyval}");
+            if (Language != null) pokedata.Add($"Language: {Language}");
+
             if (OverrideTrainer)
             {
-                var shinyval = "Yes";
-                int TIDval = Format > 7 ? TID7 : TID;
-                int SIDval = Format > 7 ? SID7 : SID;
+                int TIDval = Format >= 7 ? TID7 : TID;
+                int SIDval = Format >= 7 ? SID7 : SID;
                 string Genderval = OT_Gender == 0 ? "Male" : "Female";
-
-                if (Ball != Ball.None) pokedata.Add($"Ball: {Ball} Ball");
-                if (ShinyType == Core.Shiny.AlwaysStar) shinyval = "Star";
-                if (ShinyType == Core.Shiny.AlwaysSquare) shinyval = "Square";
-                if (Shiny) pokedata.Add($"Shiny: {shinyval}");
-                if (Language != null) pokedata.Add($"Language: {Language}");
                 if (OT != string.Empty) pokedata.Add($"OT: {OT}");
                 pokedata.Add($"TID: {TIDval}");
                 pokedata.Add($"SID: {SIDval}");