Merge branch 'V3.3' into feature-qr-code

core/src/cz/nic/tablexia/game/GameDefinition.java

@@ -47,10 +47,20 @@ public enum GameDefinition implements ApplicationEvent, IMenuItem {
     RUNES           (7, ApplicationTextManager.ApplicationTextsAssets.GAME_RUNES_TITLE, ApplicationTextManager.ApplicationTextsAssets.GAME_RUNES_DESCRIPTION, RunesPageScreen.class, RunesGame.class, false, new RunesGameResultResolver(),ApplicationTextManager.ApplicationTextsAssets.GAME_SCORE, ApplicationTextManager.ApplicationTextsAssets.GAME_AVERAGE_SCORE),
     CRIME_SCENE     (8, ApplicationTextManager.ApplicationTextsAssets.GAME_CRIME_SCENE_TITLE, ApplicationTextManager.ApplicationTextsAssets.GAME_CRIME_SCENE_DESCRIPTION, CrimeScenePageScreen.class, CrimeSceneGame.class, false, new CrimeSceneGame.GameResultResolver(), ApplicationTextManager.ApplicationTextsAssets.GAME_SCORE, ApplicationTextManager.ApplicationTextsAssets.GAME_AVERAGE_SCORE);
 
-    public interface GameResultResolver {
-        AbstractTablexiaGame.GameResult getGameCupsResult(Game game);
-        float getGameScoreResult(Game game);
-        List<GameScore> getGameScoreList(GameDifficulty difficulty, AbstractTablexiaGame.GameResult result);
+    public static abstract class GameResultResolver {
+        public abstract AbstractTablexiaGame.GameResult getGameCupsResult(Game game);
+        public abstract float getGameScoreResult(Game game);
+        public abstract List<GameScore> getGameScoreList(GameDifficulty difficulty, AbstractTablexiaGame.GameResult result);
+
+        //Override this method if you want to use different values to sort graphs in statistics screen (eg. CrimeScene)
+        public float getStatisticsScore(Game game) {
+            return getGameScoreResult(game);
+        }
+
+        //Override this method if you want to show different formatted score in graph detail dialogs in statistics screen (eg. Pursuit or CrimeScene)
+        public String getFormattedScoreForStatistics(Game game) {
+            return Integer.toString(Math.round(getGameScoreResult(game)));
+        }
     }
 
     private int                                      gameNumber;

core/src/cz/nic/tablexia/game/games/crime_scene/CrimeSceneGame.java

@@ -108,7 +108,8 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
     private int                     actualRound = 1;
     private int                     wrongRounds = 0;
 
-    public static class GameResultResolver implements GameDefinition.GameResultResolver {
+    public static class GameResultResolver extends GameDefinition.GameResultResolver {
+        private static final String FORMATTED_TEXT_FOR_STATISTICS_FORMAT = "%d / %d";
 
         @Override
         public AbstractTablexiaGame.GameResult getGameCupsResult(Game game) {
@@ -121,6 +122,17 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
             return Float.parseFloat(game.getGameScore(SCORE_KEY_COUNT, String.valueOf(correctSounds)));
         }
 
+        @Override
+        public float getStatisticsScore(Game game) {
+            //Score to sort graph values in statistics is calculated as "actualScore / maxScore". So 2 cups on hard difficulty wont show up higher than 3 cups on medium difficulty.
+            return getGameScoreResult(game) / (float)(getMaxScoreForDifficulty(GameDifficulty.getGameDifficultyForDifficultyNumber(game.getGameDifficulty())));
+        }
+
+        @Override
+        public String getFormattedScoreForStatistics(Game game) {
+            return String.format(FORMATTED_TEXT_FOR_STATISTICS_FORMAT, Math.round(getGameScoreResult(game)), getMaxScoreForDifficulty(GameDifficulty.getGameDifficultyForDifficultyNumber(game.getGameDifficulty())));
+        }
+
         @Override
         public List<GameScore> getGameScoreList(GameDifficulty difficulty, GameResult result) {
             ArrayList gameScoreList = new ArrayList<GameScore>(1);
@@ -549,14 +561,18 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
                 actionsStripWidget.getSelectedActions().size() + objectsLayer.getChildren().size == getData().getSolution().size();
     }
 
-    private int getMaxScore() {
+    private static int getMaxScoreForDifficulty(GameDifficulty gameDifficulty) {
         int maxScore = 0;
         for(int i = 0; i < MAX_ROUNDS; i++) {
-            maxScore += CrimeSceneDifficulty.getCrimeSceneDifficultyForGameDifficulty(getGameDifficulty()).getNumberOfObjects() + i;
+            maxScore += CrimeSceneDifficulty.getCrimeSceneDifficultyForGameDifficulty(gameDifficulty).getNumberOfObjects() + i;
         }
         return maxScore;
     }
 
+    private int getMaxScore() {
+        return getMaxScoreForDifficulty(getGameDifficulty());
+    }
+
     private void playAllSounds() {
         preparePlaySoundScreen(true);
         playSoundScreen.playSounds();