From b438650e5d2c9c8be3ecd0fbf8e03546a1389698 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 14 Nov 2016 19:04:08 -0800 Subject: [PATCH] less reflective stringy properties --- PKHeX/Subforms/PKM Editors/BatchEditor.cs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/PKHeX/Subforms/PKM Editors/BatchEditor.cs b/PKHeX/Subforms/PKM Editors/BatchEditor.cs index 7c3d74e45..6d996791c 100644 --- a/PKHeX/Subforms/PKM Editors/BatchEditor.cs +++ b/PKHeX/Subforms/PKM Editors/BatchEditor.cs @@ -82,6 +82,8 @@ private void runBackgroundWorker() FLP_RB.Enabled = RTB_Instructions.Enabled = B_Go.Enabled = false; b = new BackgroundWorker {WorkerReportsProgress = true}; + screenStrings(Filters); + screenStrings(Instructions); b.DoWork += (sender, e) => { if (RB_SAV.Checked) @@ -224,6 +226,22 @@ private void processFolder(string[] files, List Filters, List b.ReportProgress(i); } } + private static void screenStrings(IEnumerable il) + { + foreach (var i in il.Where(i => !i.PropertyValue.All(char.IsDigit))) + { + switch (i.PropertyName) + { + case "Species": i.setScreenedValue(Main.GameStrings.specieslist); continue; + case "HeldItem": i.setScreenedValue(Main.GameStrings.itemlist); continue; + case "Move1": case "Move2": case "Move3": case "Move4": i.setScreenedValue(Main.GameStrings.movelist); continue; + case "RelearnMove1": case "RelearnMove2": case "RelearnMove3": case "RelearnMove4": i.setScreenedValue(Main.GameStrings.movelist); continue; + case "Ability": i.setScreenedValue(Main.GameStrings.abilitylist); continue; + case "Nature": i.setScreenedValue(Main.GameStrings.natures); continue; + case "Ball": i.setScreenedValue(Main.GameStrings.balllist); continue; + } + } + } private void tabMain_DragEnter(object sender, DragEventArgs e) { @@ -246,6 +264,11 @@ public class StringInstruction public string PropertyName; public string PropertyValue; public bool Evaluator; + public void setScreenedValue(string[] arr) + { + int index = Array.IndexOf(arr, PropertyValue); + PropertyValue = index > -1 ? index.ToString() : PropertyValue; + } } private enum ModifyResult {