adjust points calculation for solved just play level

References #46
djschilling · Aug 24, 2015 · 09a8e2a · 09a8e2a
1 parent 235d0a4
commit 09a8e2a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/app/src/main/java/de/sopa/model/justplay/JustPlayLevelResult.java b/app/src/main/java/de/sopa/model/justplay/JustPlayLevelResult.java
@@ -7,11 +7,13 @@ public class JustPlayLevelResult {
 
     private final int leftTime;
     private final int moves;
+    private final int minLevelMoves;
 
-    public JustPlayLevelResult(int leftTime, int moves) {
+    public JustPlayLevelResult(int leftTime, int moves, int minLevelMoves) {
 
         this.leftTime = leftTime;
         this.moves = moves;
+        this.minLevelMoves = minLevelMoves;
     }
 
     public int getLeftTime() {
@@ -24,4 +26,10 @@ public int getMoves() {
 
         return moves;
     }
+
+
+    public int getMinLevelMoves() {
+
+        return minLevelMoves;
+    }
 }
diff --git a/app/src/main/java/de/sopa/model/justplay/JustPlayServiceImpl.java b/app/src/main/java/de/sopa/model/justplay/JustPlayServiceImpl.java
@@ -63,7 +63,12 @@ private int calculateNewScore(JustPlayLevelResult justPlayLevelResult, LevelSett
         if (justPlayLevelResult.getLeftTime() == -1) {
             return lastScore;
         } else {
-            return lastScore + levelSetting.getMaxScore() - justPlayLevelResult.getMoves() * 10;
+            double movesToMinMovesratio = (double) justPlayLevelResult.getMinLevelMoves()
+                / justPlayLevelResult.getMoves();
+
+            double additionalScore = levelSetting.getMaxScore() * movesToMinMovesratio;
+
+            return lastScore + (int) additionalScore;
         }
     }
 

diff --git a/app/src/main/java/de/sopa/scene/justplay/JustPlayGameScene.java b/app/src/main/java/de/sopa/scene/justplay/JustPlayGameScene.java
@@ -125,7 +125,8 @@ public void onTimePassed(TimerHandler pTimerHandler) {
                             engine.unregisterUpdateHandler(pTimerHandler);
                             storyService.loadJustPlayScoreSceneFromJustPlayScene(
                                 new JustPlayLevelResult(timeBasedGameService.getRemainingTime(),
-                                    gameService.getLevel().getMovesCount()));
+                                    gameService.getLevel().getMovesCount(),
+                                    gameService.getLevel().getMinimumMovesToSolve()));
                         }
                     }));
         }
@@ -144,7 +145,8 @@ public void onTimePassed(TimerHandler pTimerHandler) {
 
                             engine.unregisterUpdateHandler(pTimerHandler);
                             storyService.loadJustPlayScoreSceneFromJustPlayScene(
-                                new JustPlayLevelResult(-1, gameService.getLevel().getMovesCount()));
+                                new JustPlayLevelResult(-1, gameService.getLevel().getMovesCount(),
+                                    gameService.getLevel().getMinimumMovesToSolve()));
                         }
                     }));
         }