Fix bug with generation stuff.

Author: FM1337

python/main.py

@@ -66,8 +66,8 @@ def version():
     sys.stdout.flush()
 
 
-def getInfo(pkmn):
-        sys.stdout.write(Pokemon(pkmn, language, moveTypes, sprites).toJSON())
+def getInfo(pkmn, generation):
+        sys.stdout.write(Pokemon(pkmn, language, moveTypes, sprites, generation).toJSON())
         sys.stdout.write("\n")
         sys.stdout.flush()
 
@@ -105,7 +105,7 @@ def handleTermination(signum, frame):
             sys.exit(1)
     elif args.mode == 'info':
         try:
-            getInfo(pkmn)
+            getInfo(pkmn, args.generation if args.generation is not None else "")
         except Exception as e:
             sys.stderr.write(json.dumps({"error": "something went wrong with getting info for your Pokemon"}))
             sys.stderr.write("\n")

python/utils/pkmn.py

@@ -10,7 +10,7 @@
 from PKHeX.Core import GameInfo, RibbonInfo, RibbonStrings, EntitySummary, GameStrings, QRMessageUtil, FormConverter
 
 class Pokemon:
-    def __init__(self, pkmn, strings: LanguageStrings, moveTypes: MoveTypes, spriteHelper: Sprites) -> None:
+    def __init__(self, pkmn, strings: LanguageStrings, moveTypes: MoveTypes, spriteHelper: Sprites, generation: str) -> None:
         # We can piggyback off of EntitySummary to get a lot of the data we need
         entity = EntitySummary(pkmn, GameStrings("en"))
         self.nickname = entity.Nickname
@@ -79,7 +79,12 @@ def __init__(self, pkmn, strings: LanguageStrings, moveTypes: MoveTypes, spriteH
 
         self.ot_gender = GameInfo.GenderSymbolASCII[pkmn.OT_Gender]
         self.is_legal, self.illegal_reasons = legality_check(pkmn)
-        self.generation = get_generation_from_version(pkmn.Version)
+        try:
+            self.generation = get_generation_from_version(pkmn.Version)
+        except:
+
+            self.generation = generation if generation != "" else str(pkmn.Generation)
+
         self.dex_number = pkmn.Species
         self.size = pkmn.SIZE_STORED
         self.item_num = pkmn.HeldItem