fully implement hatching eggs

closes #2

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "lib/PokeGOAPI-Java"]
 	path = lib/PokeGOAPI-Java
 	url = https://github.com/Grover-c13/PokeGOAPI-Java.git
+	branch = Development

src/main/kotlin/ink/abb/pogo/scraper/tasks/HatchEggs.kt

@@ -8,25 +8,46 @@
 
 package ink.abb.pogo.scraper.tasks
 
-import ink.abb.pogo.scraper.util.Log
+import POGOProtos.Enums.PokemonIdOuterClass
 import POGOProtos.Networking.Responses.UseItemEggIncubatorResponseOuterClass
 import ink.abb.pogo.scraper.Bot
 import ink.abb.pogo.scraper.Context
 import ink.abb.pogo.scraper.Settings
 import ink.abb.pogo.scraper.Task
+import ink.abb.pogo.scraper.util.Log
+import ink.abb.pogo.scraper.util.pokemon.getIvPercentage
 
 class HatchEggs : Task {
 
     override fun run(bot: Bot, ctx: Context, settings: Settings) {
         val freeIncubators = ctx.api.inventories.incubators.filter { !it.isInUse }
-        val eggs = ctx.api.inventories.hatchery.eggs.filter { it.eggIncubatorId == null || it.eggIncubatorId.isBlank() }
+        val eggs = ctx.api.inventories.hatchery.eggs
+                .filter { it.eggIncubatorId == null || it.eggIncubatorId.isBlank() }
+                .sortedByDescending { it.eggKmWalkedTarget }
         if (freeIncubators.isNotEmpty() && eggs.isNotEmpty()) {
             val result = freeIncubators.first().hatchEgg(eggs.first())
             if (result == UseItemEggIncubatorResponseOuterClass.UseItemEggIncubatorResponse.Result.SUCCESS) {
                 Log.green("Put egg ${eggs.first().id} in unused incubator")
             } else {
                 Log.red("Failed to put egg in incubator; error: $result")
             }
+        } else {
+            val result = ctx.api.inventories.hatchery.queryHatchedEggs()
+            if (result.isNotEmpty()) {
+                result.forEachIndexed { index, it ->
+                    // TODO: That proto is probably wrong and this fails.
+                    val newPokemon = ctx.api.inventories.pokebank.getPokemonById(it.id)
+                    println(newPokemon)
+                    println(it.id)
+                    val stats = "+${it.candy} candy; +${it.experience} XP; +${it.stardust} stardust"
+                    if (newPokemon == null) {
+                        Log.green("Hatched pokemon; $stats")
+                    } else {
+                        Log.green("Hatched ${newPokemon.pokemonId.name} with ${newPokemon.cp} CP " +
+                                "and ${newPokemon.getIvPercentage()}% IV; $stats")
+                    }
+                }
+            }
         }
     }
 }

src/main/kotlin/ink/abb/pogo/scraper/tasks/ReleasePokemon.kt

@@ -54,7 +54,7 @@ class ReleasePokemon : Task {
                                 if (pokemon.cp < minCP || minCP == -1) {
                                     cpTooLow = true
                                 }
-                                reason = "CP < $minCP and IV < $minIVPercentage"
+                                reason = "CP < $minCP and IV < $minIVPercentage%"
                                 shouldRelease = ivTooLow && cpTooLow
                             }
                             if (shouldRelease) {