peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge dev/client_beck into development

Browse Source
This commit is contained in:
Felix Koppe
2024-12-07 15:05:03 +01:00
parent 0c42a2df88
commit 06b37584cb
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java
View File

@@ -28,7 +28,7 @@ public enum Asset {
ship(0.8f), ship(0.8f),
smallTent, smallTent,
tank, tank,
world(1.2f), world("Models/world/world_export_newTex.obj", "Models/world/world_diff.png",1.2f),
shieldRing("Models/shieldRing/shieldRing.j3o", null), shieldRing("Models/shieldRing/shieldRing.j3o", null),
treeSmall(1.2f), treeSmall(1.2f),
treeBig(1.2f), treeBig(1.2f),
@@ -40,7 +40,6 @@ public enum Asset {
shieldSymbol("Models/shieldCard/shieldSymbol.j3o", "Models/shieldCard/shieldCard_diff.png"), shieldSymbol("Models/shieldCard/shieldSymbol.j3o", "Models/shieldCard/shieldCard_diff.png"),
dice, dice,
missile("Models/missile/AVMT300.obj", "Models/missile/texture.jpg", 0.1f), missile("Models/missile/AVMT300.obj", "Models/missile/texture.jpg", 0.1f),
dice,
tankShoot("Models/tank/tank_shoot_bot.obj", "Models/tank/tank_diff.png"), tankShoot("Models/tank/tank_shoot_bot.obj", "Models/tank/tank_diff.png"),
tankShootTop("Models/tank/tank_shoot_top.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), treesSmallBackground("Models/treeSmall/small_trees_background.obj", "Models/treeSmall/treeSmall_diff.png", 1.2f),

2
Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
View File

@@ -158,7 +158,7 @@ else if(boardSelect != null) {
gameView.getBoardHandler().movePieceStartAnim(p,0); gameView.getBoardHandler().movePieceStartAnim(p,0);
//gameView.getBoardHandler().movePieceAnim(p,0, 8); //gameView.getBoardHandler().movePieceAnim(p,0, 8);
} else { } else {
gameView.getBoardHandler().throwMissileAnim(p); gameView.getBoardHandler().throwPiece(p, Color.NAVY);
//gameView.getBoardHandler().movePieceStartAnim(p,0); //gameView.getBoardHandler().movePieceStartAnim(p,0);
} }

1
Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java
View File

@@ -37,7 +37,6 @@ enum SoundAsset {
LOSE("lose.ogg"), LOSE("lose.ogg"),
MISSILE("missile.ogg"), MISSILE("missile.ogg"),
MATRIX("matrix.wav"), MATRIX("matrix.wav"),
CONNECTED("connected.wav");
CONNECTED("connected.wav"), CONNECTED("connected.wav"),
TURRET_ROTATE("turret_rotate.ogg"), TURRET_ROTATE("turret_rotate.ogg"),
TANK_SHOOT("tank_shoot.ogg") TANK_SHOOT("tank_shoot.ogg")

4
Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
View File

@@ -13,9 +13,7 @@
import pp.mdga.client.Asset; import pp.mdga.client.Asset;
import pp.mdga.client.MdgaApp; import pp.mdga.client.MdgaApp;
import pp.mdga.client.acoustic.MdgaSound; import pp.mdga.client.acoustic.MdgaSound;
import pp.mdga.client.animation.MissileAnimation; import pp.mdga.client.animation.*;
import pp.mdga.client.animation.MoveControl;
import pp.mdga.client.animation.JetAnimation;
import pp.mdga.client.gui.DiceControl; import pp.mdga.client.gui.DiceControl;
import pp.mdga.game.Color; import pp.mdga.game.Color;

2
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java
View File

@@ -38,7 +38,7 @@ protected void handlePowerCard(PlayCardMessage msg) {
protected void throwPiece(Piece piece) { protected void throwPiece(Piece piece) {
logic.getGame().getBoard().getInfield()[logic.getGame().getBoard().getInfieldIndexOfPiece(piece)].clearOccupant(); logic.getGame().getBoard().getInfield()[logic.getGame().getBoard().getInfieldIndexOfPiece(piece)].clearOccupant();
logic.getGame().getPlayerByColor(piece.getColor()).addWaitingPiece(piece); 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().getPlayerByColor(piece.getColor()).getPlayerStatistic().increasePiecesBeingThrown();
logic.getGame().getGameStatistics().increasePiecesBeingThrown(); logic.getGame().getGameStatistics().increasePiecesBeingThrown();
piece.setState(PieceState.WAITING); piece.setState(PieceState.WAITING);