Merge branch 'feature-crimescenegame-devel' into 'V3.3'

#486 Feature crimescenegame devel



See merge request !414

core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java

@@ -77,7 +77,7 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Map<ITrophyDefiniti
     private static final Point  SCREEN_SIZE                         = new Point(TablexiaSettings.getWorldSize(), TablexiaSettings.getMinWorldHeight());
     private static final int    TROPHY_DIALOG_WIDTH                 = 350;
     private static final int    TROPHY_DIALOG_HEIGHT                = 350;
-    private static final int    BACKGROUND_TILE_REPEAT_COUNT        = 23;
+    private static final int    BACKGROUND_TILE_REPEAT_COUNT        = 28;
     private static final float  TILE_SCREE_WIDTH_RATIO              = 0.25f;
     private static final long   MOUSE_CHEESE_ANIM_DURATION          = 1500;
     private static final long   MOUSE_DIALOG_DURATION               = 8000;

core/src/cz/nic/tablexia/screen/halloffame/trophy/TrophyHelper.java

@@ -110,14 +110,14 @@ public class TrophyHelper {
         trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY2, new Trio<Float, Float, Float>(5.05f, 0.77f, 0.7f));// in_the_darkness_5_finished,33
         trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY3, new Trio<Float, Float, Float>(4.85f, 0.1f, 0.7f));// in_the_darkness_10_finished.34
         trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_DIFF1, new Trio<Float, Float, Float>(4.85f, 0.65f, 0.7f));// in_the_darkness_1_limit,31
-        trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_DIFF2, new Trio<Float, Float, Float>(5.23f, 0.4f, 0.7f));// in_the_darkness_2_limit,35
+        trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_DIFF2, new Trio<Float, Float, Float>(5.21f, 0.4f, 0.7f));// in_the_darkness_2_limit,35
 
         //TODO - Position 'em
-        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_PLAY1, new Trio<Float, Float, Float>(0f, -1f, 0.7f));// crime_scene_1_finished,32
-        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_PLAY2, new Trio<Float, Float, Float>(0f, -1f, 0.7f));// crime_scene_5_finished,33
-        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_PLAY3, new Trio<Float, Float, Float>(0f, -1f, 0.7f));// crime_scene_10_finished.34
-        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_DIFF1, new Trio<Float, Float, Float>(0f, -1f, 0.7f));// crime_scene_1_limit,31
-        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_DIFF2, new Trio<Float, Float, Float>(0f, -1f, 0.7f));// crime_scene_2_limit,35
+        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_PLAY1, new Trio<Float, Float, Float>(5.55f, 0.65f, 0.5f));// crime_scene_1_finished,32
+        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_PLAY2, new Trio<Float, Float, Float>(5.45f, 0.42f, 0.5f));// crime_scene_5_finished,33
+        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_PLAY3, new Trio<Float, Float, Float>(5.7f,  0.23f, 0.5f));// crime_scene_10_finished.34
+        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_DIFF1, new Trio<Float, Float, Float>(6.18f, 0.12f, 0.5f));// crime_scene_1_limit,31
+        trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_DIFF2, new Trio<Float, Float, Float>(5.95f, 0.14f, 0.5f));// crime_scene_2_limit,35
 
         //USER TROPHIES
         trophiesProperties.put(UserTrophyDefinition.CONSECUTIVELY_DAYSBACK_3, new Trio<Float, Float, Float>(0.87f, 0.38f, 1f));//user_consecutively3days,2