Improved error messages from JSON converter.

Nifyr · Apr 15, 2023 · 90fa53d · 90fa53d
1 parent b85890e
commit 90fa53d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Forms/JsonConverterForm.cs b/Forms/JsonConverterForm.cs
@@ -358,6 +358,8 @@ private void ImportJson(object sender, EventArgs e)
 
         private (List<GameDataTypes.Pokemon>, List<GameDataTypes.DexEntry>) ParsePokemonSructs(List<JsonConverterStructs.Pokemon> data, List<GameDataTypes.Pokemon> oldEntries)
         {
+            if (data.Count == 0)
+                throw new ArgumentException("You sure this was the right JSON? This one didn't have any of the data I expected...");
             if (data.Count != oldEntries.Count)
                 throw new ArgumentException("Incorrect number of Pokémon in the json, friend.");
             List<GameDataTypes.Pokemon> personalEntries = new();
@@ -468,6 +470,8 @@ private void ImportJson(object sender, EventArgs e)
 
         private List<GameDataTypes.Trainer> ParseTrainerStructs(List<JsonConverterStructs.Trainer> data, List<GameDataTypes.Trainer> oldEntries)
         {
+            if (data.Count == 0)
+                throw new ArgumentException("You sure this was the right JSON? This one didn't have any of the data I expected...");
             if (data.Count != oldEntries.Count)
                 throw new ArgumentException("Incorrect number of trainers in the json, friend.");
             List<GameDataTypes.Trainer> trainers = new();
@@ -516,7 +520,7 @@ private void ImportJson(object sender, EventArgs e)
                 };
 
                 if (jt.useItems.Count > 4)
-                    throw new ArgumentException("Invalid input. You gave " + gt.name + " " + jt.useItems.Count + " items, mate.");
+                    throw new ArgumentException("Invalid input. You gave trainerID " + gt.trainerID + " " + jt.useItems.Count + " items, mate.");
                 gt.SetItems(jt.useItems.Select(s => GetIndex(items, s)).ToList());
 
                 gt.SetAIFlags(new bool[]
@@ -539,10 +543,10 @@ private void ImportJson(object sender, EventArgs e)
                     JsonConverterStructs.TrainerPokemon jtp = jt.party[tpIdx];
                     GameDataTypes.TrainerPokemon gtp = gt.trainerPokemon[tpIdx];
                     if (jtp.moveset.Count > 4)
-                        throw new ArgumentException("Invalid input. You gave a pokémon of " + gt.name + " " + jtp.moveset.Count + " moves, buddy.");
+                        throw new ArgumentException("Invalid input. You gave a pokémon of trainer ID " + gt.trainerID + " " + jtp.moveset.Count + " moves, buddy.");
                     gtp.SetMoves(jt.party[tpIdx].moveset.Select(s => (ushort)GetIndex(moves, s)).ToList());
                     if (jtp.formID >= gameData.dexEntries[gtp.dexID].forms.Count)
-                        throw new ArgumentException("Invalid input. You gave a " + jtp.species + " of " + gt.name + " a formID of " + jtp.formID + ", chompsky honk.");
+                        throw new ArgumentException("Invalid input. You gave a " + jtp.species + " of trainer ID " + gt.trainerID + " a formID of " + jtp.formID + ", chompsky honk.");
                 }
 
                 trainers.Add(gt);
@@ -552,6 +556,8 @@ private void ImportJson(object sender, EventArgs e)
 
         private static List<GameDataTypes.MessageFileSet> ParseTextStructs(List<JsonConverterStructs.MessageFileSet> data, List<GameDataTypes.MessageFileSet> oldEntries)
         {
+            if (data.Count == 0)
+                throw new ArgumentException("You sure this was the right JSON? This one didn't have any of the data I expected...");
             if (data.Count != oldEntries.Count)
                 throw new ArgumentException("Incorrect number of languages in the json, friend.");
             for (int languageIdx = 0; languageIdx < oldEntries.Count; languageIdx++)