From 2055edb7e3357e24b54a9b0ca5eb5a6cad594214 Mon Sep 17 00:00:00 2001 From: Olle Kelderman Date: Fri, 19 Oct 2018 11:02:31 +0200 Subject: [PATCH 1/2] add intellij stuff to gitignore --- osuApiConnector/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osuApiConnector/.gitignore b/osuApiConnector/.gitignore index 7075a2f..062c75b 100644 --- a/osuApiConnector/.gitignore +++ b/osuApiConnector/.gitignore @@ -2,3 +2,7 @@ /.classpath /.project /.settings + +# IntelliJ IDEA +/.idea +/*.iml From cd7fd421dd71ce4cf741326a0ebf9fe43a6e9759 Mon Sep 17 00:00:00 2001 From: Olle Kelderman Date: Fri, 19 Oct 2018 11:30:50 +0200 Subject: [PATCH 2/2] add hp calc --- .../org/tillerino/osuApiModel/OsuApiBeatmap.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/osuApiConnector/src/main/java/org/tillerino/osuApiModel/OsuApiBeatmap.java b/osuApiConnector/src/main/java/org/tillerino/osuApiModel/OsuApiBeatmap.java index e996f4f..1bde874 100644 --- a/osuApiConnector/src/main/java/org/tillerino/osuApiModel/OsuApiBeatmap.java +++ b/osuApiConnector/src/main/java/org/tillerino/osuApiModel/OsuApiBeatmap.java @@ -264,6 +264,17 @@ public static double calcCircleSize(double circleSize, @BitwiseMods long mods) { return circleSize; } + private double calcHpDrain(double healthDrain, @BitwiseMods long mods) { + if(Easy.is(mods)) { + healthDrain /= 2; + } + if(HardRock.is(mods)) { + healthDrain *= 1.4; + } + // adjusting for DT/HT is impossible and doesnt make a whole lot of sense so lets just ignore it + return healthDrain; + } + public double getApproachRate(@BitwiseMods long mods) { return calcAR(getApproachRate(), mods); } @@ -283,4 +294,8 @@ public int getTotalLength(@BitwiseMods long mods) { public double getCircleSize(@BitwiseMods long mods) { return calcCircleSize(getCircleSize(), mods); } + + public double getHealthDrain(@BitwiseMods long mods) { + return calcHpDrain(getHealthDrain(), mods); + } }