From 0282767aee89b40c9bcb2e94bd7e946562f971f5 Mon Sep 17 00:00:00 2001 From: Jari Date: Mon, 25 Jul 2016 12:35:42 +0200 Subject: [PATCH 1/3] Added iv calculator --- src/main/java/com/pokegoapi/api/pokemon/Pokemon.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java b/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java index 64c77c4e..2506ff10 100644 --- a/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java +++ b/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java @@ -267,6 +267,14 @@ public int getIndividualDefense() { public int getIndividualStamina() { return proto.getIndividualStamina(); } + + /** + * Calculates the pokemons IV ratio + * @return the pokemons IV ratio as a double between 0 and 1.0, 1.0 being perfect IVs + */ + public double getIVRatio() { + return (this.getIndividualAttack() + this.getIndividualDefense() + this.getIndividualStamina()) / 45.0; + } public float getCpMultiplier() { return proto.getCpMultiplier(); From 71d49681f6954dac447e4638adf59cb0bad943c0 Mon Sep 17 00:00:00 2001 From: Jari Date: Mon, 25 Jul 2016 13:01:28 +0200 Subject: [PATCH 2/3] checkstyleMain fix --- src/main/java/com/pokegoapi/api/pokemon/Pokemon.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java b/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java index 2506ff10..b3b85103 100644 --- a/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java +++ b/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java @@ -269,8 +269,8 @@ public int getIndividualStamina() { } /** - * Calculates the pokemons IV ratio - * @return the pokemons IV ratio as a double between 0 and 1.0, 1.0 being perfect IVs + * Calculates the pokemons IV ratio. + * @return the pokemons IV ratio as a double between 0 and 1.0, 1.0 being perfect IVs. */ public double getIVRatio() { return (this.getIndividualAttack() + this.getIndividualDefense() + this.getIndividualStamina()) / 45.0; From d9bd1a269b4b379a5c3cc67eae70eee2f0fe72bc Mon Sep 17 00:00:00 2001 From: Jari Date: Mon, 25 Jul 2016 13:12:03 +0200 Subject: [PATCH 3/3] Fix @returns in doc of getIVRatio() --- src/main/java/com/pokegoapi/api/pokemon/Pokemon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java b/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java index b3b85103..e4146d02 100644 --- a/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java +++ b/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java @@ -270,7 +270,7 @@ public int getIndividualStamina() { /** * Calculates the pokemons IV ratio. - * @return the pokemons IV ratio as a double between 0 and 1.0, 1.0 being perfect IVs. + * @return the pokemons IV ratio as a double between 0 and 1.0, 1.0 being perfect IVs */ public double getIVRatio() { return (this.getIndividualAttack() + this.getIndividualDefense() + this.getIndividualStamina()) / 45.0;