diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java index 65581da1..06143239 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java @@ -28,7 +28,7 @@ public enum Asset { ship(0.8f), smallTent, tank, - world(1.2f), + world("Models/world/world_export_newTex.obj", "Models/world/world_diff.png",1.2f), shieldRing("Models/shieldRing/shieldRing.j3o", null), treeSmall(1.2f), treeBig(1.2f), @@ -40,7 +40,6 @@ public enum Asset { shieldSymbol("Models/shieldCard/shieldSymbol.j3o", "Models/shieldCard/shieldCard_diff.png"), dice, missile("Models/missile/AVMT300.obj", "Models/missile/texture.jpg", 0.1f), - dice, tankShoot("Models/tank/tank_shoot_bot.obj", "Models/tank/tank_diff.png"), tankShootTop("Models/tank/tank_shoot_top.obj", "Models/tank/tank_diff.png"), treesSmallBackground("Models/treeSmall/small_trees_background.obj", "Models/treeSmall/treeSmall_diff.png", 1.2f), diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java index 067cbf6a..83c6db04 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java @@ -158,7 +158,7 @@ else if(boardSelect != null) { gameView.getBoardHandler().movePieceStartAnim(p,0); //gameView.getBoardHandler().movePieceAnim(p,0, 8); } else { - gameView.getBoardHandler().throwMissileAnim(p); + gameView.getBoardHandler().throwPiece(p, Color.NAVY); //gameView.getBoardHandler().movePieceStartAnim(p,0); } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java index 71b3950d..09671259 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java @@ -37,7 +37,6 @@ enum SoundAsset { LOSE("lose.ogg"), MISSILE("missile.ogg"), MATRIX("matrix.wav"), - CONNECTED("connected.wav"); CONNECTED("connected.wav"), TURRET_ROTATE("turret_rotate.ogg"), TANK_SHOOT("tank_shoot.ogg") diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java index 41211822..6b0c33c7 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java @@ -13,9 +13,7 @@ import pp.mdga.client.Asset; import pp.mdga.client.MdgaApp; import pp.mdga.client.acoustic.MdgaSound; -import pp.mdga.client.animation.MissileAnimation; -import pp.mdga.client.animation.MoveControl; -import pp.mdga.client.animation.JetAnimation; +import pp.mdga.client.animation.*; import pp.mdga.client.gui.DiceControl; import pp.mdga.game.Color; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java index fa93c518..8753b774 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java @@ -38,7 +38,7 @@ protected void handlePowerCard(PlayCardMessage msg) { protected void throwPiece(Piece piece) { logic.getGame().getBoard().getInfield()[logic.getGame().getBoard().getInfieldIndexOfPiece(piece)].clearOccupant(); logic.getGame().getPlayerByColor(piece.getColor()).addWaitingPiece(piece); - logic.addNotification(new ThrowPieceNotification(piece.getUuid())); + logic.addNotification(new ThrowPieceNotification(piece.getUuid(), piece.getColor())); logic.getGame().getPlayerByColor(piece.getColor()).getPlayerStatistic().increasePiecesBeingThrown(); logic.getGame().getGameStatistics().increasePiecesBeingThrown(); piece.setState(PieceState.WAITING);