Add getPercentageIV to the encountered pokemon (#841)

Author: RebliNk17

library/src/main/java/com/pokegoapi/api/inventory/PokeBank.java

@@ -151,7 +151,7 @@ public Map<PokemonFamilyId, Integer> releasePokemon(Pokemon... releasePokemon)
 			throws CaptchaActiveException, LoginFailedException, RemoteServerException {
 		ReleasePokemonMessage.Builder releaseBuilder = ReleasePokemonMessage.newBuilder();
 		for (Pokemon pokemon : releasePokemon) {
-			if (!pokemon.isDeployed()) {
+			if (!pokemon.isDeployed() && !pokemon.isFavorite()) {
 				releaseBuilder.addPokemonIds(pokemon.getId());
 			}
 		}

library/src/main/java/com/pokegoapi/api/map/pokemon/encounter/DiskEncounterResult.java

@@ -20,13 +20,10 @@
 import POGOProtos.Data.PokemonDataOuterClass;
 import POGOProtos.Networking.Responses.DiskEncounterResponseOuterClass.DiskEncounterResponse;
 import POGOProtos.Networking.Responses.EncounterResponseOuterClass.EncounterResponse;
-
 import com.pokegoapi.api.PokemonGo;
-import com.pokegoapi.api.pokemon.PokemonDetails;
-
 import lombok.Getter;
 
-public class DiskEncounterResult extends PokemonDetails implements EncounterResult {
+public class DiskEncounterResult extends Encounter implements EncounterResult {
 	@Getter
 	private DiskEncounterResponse response;
 

library/src/main/java/com/pokegoapi/api/map/pokemon/encounter/Encounter.java

@@ -0,0 +1,35 @@
+package com.pokegoapi.api.map.pokemon.encounter;
+
+import POGOProtos.Data.Capture.CaptureProbabilityOuterClass.CaptureProbability;
+import POGOProtos.Data.PokemonDataOuterClass.PokemonData;
+import POGOProtos.Networking.Responses.EncounterResponseOuterClass.EncounterResponse;
+import com.pokegoapi.api.PokemonGo;
+import com.pokegoapi.api.pokemon.PokemonDetails;
+
+
+public abstract class Encounter extends PokemonDetails implements EncounterResult {
+
+	public Encounter(PokemonGo api, PokemonData proto) {
+		super(api, proto);
+	}
+
+	public double getPercentageIV() {
+		double ivStamina = getPokemonData().getIndividualStamina();
+		double ivAttack = getPokemonData().getIndividualAttack();
+		double ivDefense = getPokemonData().getIndividualDefense();
+		return (ivAttack + ivDefense + ivStamina) * 100 / 45.0;
+	}
+
+	/**
+	 * Return the status of the encounter
+	 *
+	 * @return status of results
+	 */
+	public abstract EncounterResponse.Status getStatus();
+
+	abstract public boolean wasSuccessful();
+
+	abstract public CaptureProbability getCaptureProbability();
+
+	abstract public PokemonData getPokemonData();
+}

library/src/main/java/com/pokegoapi/api/map/pokemon/encounter/IncenseEncounterResult.java

@@ -15,17 +15,15 @@
 
 package com.pokegoapi.api.map.pokemon.encounter;
 
-
 import POGOProtos.Data.Capture.CaptureProbabilityOuterClass;
 import POGOProtos.Data.PokemonDataOuterClass;
 import POGOProtos.Networking.Responses.EncounterResponseOuterClass.EncounterResponse;
 import POGOProtos.Networking.Responses.IncenseEncounterResponseOuterClass.IncenseEncounterResponse;
 import POGOProtos.Networking.Responses.IncenseEncounterResponseOuterClass.IncenseEncounterResponse.Result;
 import com.pokegoapi.api.PokemonGo;
-import com.pokegoapi.api.pokemon.PokemonDetails;
 import lombok.Getter;
 
-public class IncenseEncounterResult extends PokemonDetails implements EncounterResult {
+public class IncenseEncounterResult extends Encounter implements EncounterResult {
 	@Getter
 	private IncenseEncounterResponse response;
 
@@ -36,11 +34,9 @@ public IncenseEncounterResult(PokemonGo api, IncenseEncounterResponse response)
 
 	@Override
 	public boolean wasSuccessful() {
-		return response != null
-				&& response.getResult() == Result.INCENSE_ENCOUNTER_SUCCESS;
+		return response != null && response.getResult() == Result.INCENSE_ENCOUNTER_SUCCESS;
 	}
 
-
 	/**
 	 * Return the status of the encounter
 	 *

library/src/main/java/com/pokegoapi/api/map/pokemon/encounter/NormalEncounterResult.java

@@ -15,54 +15,50 @@
 
 package com.pokegoapi.api.map.pokemon.encounter;
 
-
-import com.pokegoapi.api.PokemonGo;
-import com.pokegoapi.api.pokemon.PokemonDetails;
-
 import POGOProtos.Data.Capture.CaptureProbabilityOuterClass.CaptureProbability;
 import POGOProtos.Data.PokemonDataOuterClass.PokemonData;
 import POGOProtos.Map.Pokemon.WildPokemonOuterClass.WildPokemon;
 import POGOProtos.Networking.Responses.EncounterResponseOuterClass.EncounterResponse;
+import com.pokegoapi.api.PokemonGo;
 
-public class NormalEncounterResult extends PokemonDetails implements EncounterResult {
+public class NormalEncounterResult extends Encounter implements EncounterResult {
 	private EncounterResponse response;
 
 	public NormalEncounterResult(PokemonGo api, EncounterResponse response) {
 		super(api, response.getWildPokemon().getPokemonData());
 		this.response = response;
 	}
 
-	/**
-	 * Return the status of the encounter
-	 *
-	 * @return status of results
-	 */
+	public EncounterResponse.Background getBackground() {
+		return response.getBackground();
+	}
+
+	public WildPokemon getWildPokemon() {
+		return response.getWildPokemon();
+	}
+
+	public EncounterResponse toPrimitive() {
+		return response;
+	}
+
+	@Override
 	public EncounterResponse.Status getStatus() {
 		return response == null ? null : response.getStatus();
 	}
 
+	@Override
 	public boolean wasSuccessful() {
 		return response != null
 				&& getStatus() != null && getStatus().equals(EncounterResponse.Status.ENCOUNTER_SUCCESS);
 	}
 
-	public EncounterResponse.Background getBackground() {
-		return response.getBackground();
-	}
-
+	@Override
 	public CaptureProbability getCaptureProbability() {
 		return response.getCaptureProbability();
 	}
 
-	public WildPokemon getWildPokemon() {
-		return response.getWildPokemon();
-	}
-
+	@Override
 	public PokemonData getPokemonData() {
 		return response.getWildPokemon().getPokemonData();
 	}
-
-	public EncounterResponse toPrimitive() {
-		return response;
-	}
 }

library/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java

@@ -82,6 +82,8 @@ public Pokemon(PokemonGo api, PokemonData proto) {
 	 * @throws CaptchaActiveException if a captcha is active and the message can't be sent
 	 */
 	public Result transferPokemon() throws LoginFailedException, CaptchaActiveException, RemoteServerException {
+		if (this.isFavorite())
+			return Result.FAILED;
 		ReleasePokemonMessage reqMsg = ReleasePokemonMessage.newBuilder().setPokemonId(getId()).build();
 
 		ServerRequest serverRequest = new ServerRequest(RequestType.RELEASE_POKEMON, reqMsg);
@@ -474,4 +476,4 @@ public int hashCode() {
 	public boolean equals(Object obj) {
 		return obj instanceof Pokemon && ((Pokemon) obj).getId() == getId();
 	}
-}
+}