Merge branch 'devel' into feature-abstractgame

core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java

@@ -3,6 +3,7 @@ package cz.nic.tablexia.game.games.pursuit;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Action;
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.EventListener;
 import com.badlogic.gdx.scenes.scene2d.Group;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.utils.Array;
@@ -79,13 +80,13 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
 
     private static final Point SCREEN_SIZE = new Point(TablexiaSettings.getWorldWidth(),TablexiaSettings.getMinWorldHeight());
     private static final int GRID_PADDING = 10;
-    private static final int OVERLAPPED_PIECE_ZINDEX = 7;//pieces count -1
 
     private  static final String SCORE_KEY_MOVE_COUNT = "move_count";
 
     private Group contentGroup;
     private Grid grid;
     private int gridColumnCount;
+    private int overlappedPieceZIndex;
     private TablexiaNoBlendingImage backgroundImage;
     private DragAndRotateActorListener dragAndRotateActorListener;
     private int movesCounter;
@@ -109,6 +110,7 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
     @Override
     protected void gameLoaded(Map<String, String> gameState) {
         gridColumnCount = GameRulesHelper.getNumberOfColumns(getGameDifficulty());
+        overlappedPieceZIndex = (int)Math.pow(gridColumnCount,2)-1;
         contentGroup = new Group();
         contentGroup.setSize(SCREEN_SIZE.x, SCREEN_SIZE.y);
         getStage().addActor(contentGroup);
@@ -139,7 +141,7 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
                     PuzzlePiece puzzlePiece = (PuzzlePiece) draggedPiece;
                     PuzzlePiece overlappedPiece = grid.pieceIntersectingWithDragged(puzzlePiece.getId());
                     if (overlappedPiece != null) {
-                        overlappedPiece.setZIndex(OVERLAPPED_PIECE_ZINDEX);
+                        overlappedPiece.setZIndex(overlappedPieceZIndex);
                         overlappedPiece.setScale(1.2f);
                         grid.unscalePieces(puzzlePiece.getId(), overlappedPiece.getId());
                     } else {
@@ -212,7 +214,10 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
             @Override
             public void onVehicleDragComplete() {
                 gameComplete();
-                //TODO disable listener
+                //remove all actor listeners
+                for(EventListener el: vehicle.getListeners()){
+                    vehicle.removeListener(el);
+                }
             }
         }));
         vehicle.setDebug(TablexiaSettings.getInstance().isShowBoundingBoxes());

core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java

@@ -166,7 +166,7 @@ public class GameMenuPage extends MenuPage implements ViewPager.ScrollListener {
             }
         });
         gameDifficulty = TablexiaSettings.getInstance().getGameDifficulty(game);
-        dragSwitchListener.switchToStep(gameDifficulty.ordinal());
+        dragSwitchListener.switchToStep(gameDifficulty.getDifficultyNumber() - 1);
 
     }
 

core/src/cz/nic/tablexia/util/listener/DragAndRotateActorListener.java

@@ -17,7 +17,7 @@ import cz.nic.tablexia.game.games.pursuit.model.PuzzlePiece;
  * Created by Vaclav Tarantik on 6/18/15.
  */
 public class DragAndRotateActorListener extends InputListener {
-    private static final int DRAGGED_PIECE_ZINDEX = 8;
+    private static final int DRAGGED_PIECE_ZINDEX = 25;
     public static final float ROTATION_ANIMATION_DURATION = 0.3f;
     public static final float MOVETO_ANIMATION_DURATION = 0.4f;
     private float grabX, grabY;