#107 Added sounds for pieces

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

@@ -103,6 +103,8 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
 
     private static final String SCORE_KEY_MOVE_COUNT = "move_count";
 
+	private static final float OVERLAP_PIECE_SCALE	=	1.2f;
+
     private static final int MAPS_COUNT = 14;
 
     private Group contentGroup;
@@ -124,7 +126,24 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
         return new ExtendViewport(0, TablexiaSettings.getMinWorldHeight());
     }
 
-    @Override
+	@Override
+	protected void prepareGameSoundAssetNames(List<String> soundsFileNames) {
+		soundsFileNames.add(PursuitAssets.SOUND_CAR_1);
+		soundsFileNames.add(PursuitAssets.SOUND_CAR_2);
+		soundsFileNames.add(PursuitAssets.SOUND_CAR_3);
+		soundsFileNames.add(PursuitAssets.SOUND_CAR_4);
+
+		soundsFileNames.add(PursuitAssets.SOUND_LIFT);
+		soundsFileNames.add(PursuitAssets.SOUND_ROTATION);
+		soundsFileNames.add(PursuitAssets.SOUND_SWITCH);
+
+		soundsFileNames.add(PursuitAssets.SOUND_TRAIN_1);
+		soundsFileNames.add(PursuitAssets.SOUND_TRAIN_2);
+		soundsFileNames.add(PursuitAssets.SOUND_BOAT);
+		soundsFileNames.add(PursuitAssets.SOUND_MOTORCYCLE);
+	}
+
+	@Override
     protected int[][] prepareGameData(Map<String, String> gameState) {
         roadMap = getScreenTextureRegion(TextureHelper.getClickMapPath(mapNumber));
         if (!roadMap.getTexture().getTextureData().isPrepared()) {
@@ -151,15 +170,16 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
         ScaleUtil.setFullScreen(contentGroup, getStage());
         getStage().addActor(contentGroup);
 
-        prepareBackground();
-        prepareGrid();
-        prepareFinishFlag();
-        prepareVehicle();
+		prepareBackground();
+		prepareGrid();
+		prepareFinishFlag();
+		prepareVehicle();
 
         dragAndRotateActorListener = new DragAndRotateActorListener(new DragAndRotateActorListener.IOnRotationFinished() {
             @Override
             public void onDragAndRotationFinished() {
                 Log.info(getClass(),"DRAG AND ROTATION FINISHED");
+				getSound(PursuitAssets.SOUND_ROTATION).play();
                 dragAndRotateActorListener.setPieceAnimationDone(true);
                 setGameScore(SCORE_KEY_MOVE_COUNT, movesCounter++);
             }
@@ -168,6 +188,7 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
             public void selected(float x, float y) {
                 if (dragAndRotateActorListener != null) {
                     if (dragAndRotateActorListener.getDraggedActor() == null) {
+						getSound(PursuitAssets.SOUND_LIFT).play();
                         dragAndRotateActorListener.setDraggedActor(grid.pieceAtPoint(x, y));
                     }
                 }
@@ -180,7 +201,7 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
                     PuzzlePiece overlappedPiece = grid.pieceIntersectingWithDragged(puzzlePiece.getId());
                     if (overlappedPiece != null) {
                         overlappedPiece.setZIndex(overlappedPieceZIndex);
-                        overlappedPiece.setScale(1.2f);
+                        overlappedPiece.setScale(OVERLAP_PIECE_SCALE);
                         grid.unscalePieces(puzzlePiece.getId(), overlappedPiece.getId());
                     } else {
                         grid.unscalePieces(puzzlePiece.getId(), -1);
@@ -220,7 +241,9 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
                                 return true;
                             }
                         };
-                        grid.switchPieces(puzzlePiece, overlappedPiece, onPiecesSwitchFinishedAction);
+                        if(grid.switchPieces(puzzlePiece, overlappedPiece, onPiecesSwitchFinishedAction)) {
+							getSound(PursuitAssets.SOUND_SWITCH).play();
+						}
                     }
                 }
             }

core/src/cz/nic/tablexia/game/games/pursuit/model/Grid.java

@@ -141,9 +141,8 @@ public class Grid extends Group {
         }
     }
 
-    public void switchPieces(PuzzlePiece draggedPiece, PuzzlePiece overlappedPiece,Action moveAction) {
+    public boolean switchPieces(PuzzlePiece draggedPiece, PuzzlePiece overlappedPiece,Action moveAction) {
         if (draggedPiece != null) {
-            Log.info(getClass(),"SWITCH PIECES");
             int draggedPieceActualPosition = draggedPiece.getActualPosition();
            cz.nic.tablexia.util.Point draggedPiecePositionInPixels = getPieceGridPositionInPixels(draggedPieceActualPosition);
 
@@ -155,8 +154,11 @@ public class Grid extends Group {
                 int overlappedPieceActualPosition = overlappedPiece.getActualPosition();
                 cz.nic.tablexia.util.Point overlappedPiecePositionInPixels = getPieceGridPositionInPixels(overlappedPieceActualPosition);
                 addAction(new SwitchPiecesAction(draggedPiece,draggedPiecePositionInPixels,overlappedPiece,overlappedPiecePositionInPixels,moveAction));
-            }
+				Log.info(getClass(),"SWITCH PIECES");
+				return true;
+			}
         }
+		return false;
     }
 
     //returns the position of piece inside grid according to piece's actual position