fixed a bug where the SHIPDESTROYED Sound was played everytime

added JavaDocs
removed unnecessary lines

Projekte/battleship/client/build.gradle

@@ -9,8 +9,6 @@ implementation project(":jme-common")
     implementation project(":battleship:model")
 
     implementation libs.jme3.desktop
-    implementation libs.jme3.effects
-
     runtimeOnly libs.jme3.awt.dialogs
     runtimeOnly libs.jme3.plugins
     runtimeOnly libs.jme3.jogg

Projekte/battleship/client/client.properties

@@ -23,10 +23,10 @@ map.own=maps/map1.json
 #   2, 3
 #  defines four shots, namely at the coordinates
 #  (x=2, y=0), (x=2, y=1), (x=2, y=2), and (x=2, y=3)
-robot.targets=2, 3,\
-              2, 4,\
-              2, 5,\
-              2, 8
+robot.targets=2, 0,\
+              2, 1,\
+              2, 2,\
+              2, 3
 #
 # Delay in milliseconds between each shot fired by the RobotClient.
 robot.delay=500

Projekte/battleship/client/src/main/java/pp/battleship/client/BackgroundMusic.java

@@ -1,5 +1,6 @@
 package pp.battleship.client;
 
+import com.jme3.app.Application;
 import com.jme3.audio.AudioData.DataType;
 import com.jme3.audio.AudioNode;
 import com.jme3.audio.AudioSource.Status;
@@ -11,63 +12,62 @@
 import java.lang.System.Logger.Level;
 import java.util.prefs.Preferences;
 
+/**
+ * Class to play Background music in game
+ */
 public class BackgroundMusic implements GameEventListener {
     private static final String VOLUME_PREF = "volume";
     private static final String MUSIC_ENABLED_PREF = "musicEnabled";
-    private static final Preferences PREFS = Preferences.userNodeForPackage(BackgroundMusic.class);
-
+    private final Preferences pref = Preferences.userNodeForPackage(BackgroundMusic.class);
     static final Logger LOGGER = System.getLogger(BackgroundMusic.class.getName());
 
-    private static final String MENU_MUSIC = "Music/MainMenu/Dark_Intro.ogg";
-    private static final String BATTLE_MUSIC = "Music/BattleTheme/boss_battle_#2_metal_loop.wav";
-    private static final String GAME_OVER_MUSIC_L = "Music/GameOver/Lose/Lose.ogg";
-    private static final String GAME_OVER_MUSIC_V = "Music/GameOver/Victory/Victory.wav";
-
+    private static final String MENU_MUSIC = "Sound/Music/menu/cinematictrailerelite.ogg";
+    private static final String GAME_MUSIC = "Sound/Music/game/Aluminum.ogg";
+    private static final String VICTORY_MUSIC = "Sound/Music/victory/victorymarchofvalor.ogg";
+    private static final String LOSE_MUSIC = "Sound/Music/lose/TouchofDream.ogg";
     private final AudioNode menuMusic;
-    private final AudioNode battleMusic;
-    private final AudioNode gameOverMusicL;
-    private final AudioNode gameOverMusicV;
-    private String lastNodePlayed;
-
+    private final AudioNode gameMusic;
+    private final AudioNode victoryMusic;
+    private final AudioNode loseMusic;
+    private String lastPlayedMusic;
     private boolean musicEnabled;
     private float volume;
-
-    private final BattleshipApp app;
+    private Application app;
 
     /**
-     * Initializes and controls the BackgroundMusic
+     * Constructor for BackgroundMusic class
      *
      * @param app The main Application
      */
-    public BackgroundMusic(BattleshipApp app) {
-        this.volume = PREFS.getFloat(VOLUME_PREF, 1.0f);
-        this.musicEnabled = PREFS.getBoolean(MUSIC_ENABLED_PREF, true);
+    public BackgroundMusic(Application app) {
+        this.volume = pref.getFloat(VOLUME_PREF, 1.0f);
+        this.musicEnabled = pref.getBoolean(MUSIC_ENABLED_PREF, true);
         this.app = app;
 
-        menuMusic = createAudioNode(MENU_MUSIC);
-        battleMusic = createAudioNode(BATTLE_MUSIC);
-        gameOverMusicL = createAudioNode(GAME_OVER_MUSIC_L);
-        gameOverMusicV = createAudioNode(GAME_OVER_MUSIC_V);
-        stop(battleMusic);
-        stop(gameOverMusicL);
-        stop(gameOverMusicV);
+        menuMusic = createMusicNode(MENU_MUSIC);
+        gameMusic = createMusicNode(GAME_MUSIC);
+        victoryMusic = createMusicNode(VICTORY_MUSIC);
+        loseMusic = createMusicNode(LOSE_MUSIC);
+        stop(gameMusic);
+        stop(victoryMusic);
+        stop(loseMusic);
+        lastPlayedMusic = menuMusic.getName();
 
-        lastNodePlayed = menuMusic.getName();
-
-        if(musicEnabled) {
+        if (musicEnabled) {
             play(menuMusic);
         }
     }
 
     /**
-     * This method will be used to create the audio node containing the music
+     * Creates an audio node for the music
      *
      * @param musicFilePath the file path to the music
      * @return the created audio node
      */
-    private AudioNode createAudioNode(String musicFilePath) {
+
+    private AudioNode createMusicNode(String musicFilePath) {
         AudioNode audioNode = new AudioNode(app.getAssetManager(), musicFilePath, DataType.Stream);
-        audioNode.setVolume(volume * app.getMainVolumeControl().getMainVolume());
+        audioNode.setVolume(volume);
         audioNode.setPositional(false);
         audioNode.setLooping(true);
         audioNode.setName(musicFilePath);
@@ -75,30 +75,19 @@ private AudioNode createAudioNode(String musicFilePath) {
     }
 
     /**
-     * sets the give audio node to play
+     * Starts the music
      *
-     * @param audioNode the audio node which should start to play
+     * @param audioNode the audio node to be played
      */
     public void play(AudioNode audioNode) {
         if (musicEnabled && (audioNode.getStatus() == Status.Stopped || audioNode.getStatus() == Status.Paused)) {
             audioNode.play();
-            lastNodePlayed = audioNode.getName();
+            lastPlayedMusic = audioNode.getName();
         }
     }
 
     /**
-     * stops the given audio node from playing
-     *
-     * @param audioNode the audio node to be stopped
-     */
-    public void stop(AudioNode audioNode) {
-        if (audioNode.getStatus() == Status.Playing) {
-            audioNode.stop();
-        }
-    }
-
-    /**
-     * pauses the given audi node
+     * Pauses the music
      *
      * @param audioNode the audio node to be paused
      */
@@ -109,60 +98,128 @@ public void pause(AudioNode audioNode) {
     }
 
     /**
-     * Toggle Method to control the music to switch it on or off
+     * Stops the music
+     *
+     * @param audioNode the audio node to be stopped
+     */
+    public void stop(AudioNode audioNode) {
+        if (audioNode.getStatus() == Status.Playing) {
+            audioNode.stop();
+        }
+    }
+
+    /**
+     * Controls which music should be played
      */
     public void toggleMusic() {
         this.musicEnabled = !this.musicEnabled;
         if (musicEnabled) {
-            switch (lastNodePlayed){
+            switch (lastPlayedMusic) {
                 case MENU_MUSIC:
                     play(menuMusic);
                     break;
-                case BATTLE_MUSIC:
-                    play(battleMusic);
+                case GAME_MUSIC:
+                    play(gameMusic);
                     break;
-                case GAME_OVER_MUSIC_L:
-                    play(gameOverMusicL);
+                case VICTORY_MUSIC:
+                    play(victoryMusic);
                     break;
-                case GAME_OVER_MUSIC_V:
-                    play(gameOverMusicV);
+                case LOSE_MUSIC:
+                    play(loseMusic);
                     break;
             }
-        } else {
+        }
+        else {
             pause(menuMusic);
-            pause(battleMusic);
-            pause(gameOverMusicL);
-            pause(gameOverMusicV);
+            pause(gameMusic);
+            pause(victoryMusic);
+            pause(loseMusic);
         }
 
-        PREFS.putBoolean(MUSIC_ENABLED_PREF, musicEnabled);
+        pref.putBoolean(MUSIC_ENABLED_PREF, musicEnabled);
     }
 
     /**
-     * this method is used when the main volume changes
+     * Changes the music to the specified music if it isn't already playing
+     *
+     * @param music the music to play
      */
-    public void setVolume(){
-        setVolume(PREFS.getFloat(VOLUME_PREF, 1.0f));
+    public void changeMusic(Music music) {
+        if (music == Music.MENU_THEME && !lastPlayedMusic.equals(MENU_MUSIC)) {
+            LOGGER.log(Level.DEBUG, "Received Music change Event {0}", music.toString());
+            stop(gameMusic);
+            stop(victoryMusic);
+            stop(loseMusic);
+            play(menuMusic);
+            lastPlayedMusic = menuMusic.getName();
+        }
+        else if (music == Music.GAME_THEME && !lastPlayedMusic.equals(GAME_MUSIC)) {
+            LOGGER.log(Level.DEBUG, "Received Music change Event {0}", music.toString());
+            stop(menuMusic);
+            stop(loseMusic);
+            stop(victoryMusic);
+            play(gameMusic);
+            lastPlayedMusic = gameMusic.getName();
+        }
+        else if (music == Music.VICTORY_THEME && !lastPlayedMusic.equals(VICTORY_MUSIC)) {
+            LOGGER.log(Level.DEBUG, "Received Music change Event {0}", music.toString());
+            stop(menuMusic);
+            stop(gameMusic);
+            stop(loseMusic);
+            play(victoryMusic);
+            lastPlayedMusic = victoryMusic.getName();
+        }
+        else if (music == Music.LOSE_THEME && !lastPlayedMusic.equals(LOSE_MUSIC)) {
+            LOGGER.log(Level.DEBUG, "Received Music change Event {0}", music.toString());
+            stop(menuMusic);
+            stop(gameMusic);
+            stop(victoryMusic);
+            play(loseMusic);
+            lastPlayedMusic = loseMusic.getName();
+        }
     }
 
     /**
-     * Method to set the volume for the music
+     * Receives the different MusicEvents
+     *
+     * @param music the received Event
+     */
+    @Override
+    public void receivedEvent(MusicEvent music) {
+        LOGGER.log(Level.DEBUG, "Received Music change Event {0}", music.toString());
+        switch (music.music()) {
+            case MENU_THEME:
+                changeMusic(Music.MENU_THEME);
+                break;
+            case GAME_THEME:
+                changeMusic(Music.GAME_THEME);
+                break;
+            case VICTORY_THEME:
+                changeMusic(Music.VICTORY_THEME);
+                break;
+            case LOSE_THEME:
+                changeMusic(Music.LOSE_THEME);
+                break;
+        }
+    }
+
+    /**
+     * Set the volume for the music
      *
      * @param volume float to transfer the new volume
      */
     public void setVolume(float volume) {
         this.volume = volume;
-        float mainVolume = app.getMainVolumeControl().getMainVolume();
-        menuMusic.setVolume(volume * mainVolume);
-        battleMusic.setVolume(volume * mainVolume);
-        gameOverMusicL.setVolume(volume * mainVolume);
-        gameOverMusicV.setVolume(volume * mainVolume);
+        menuMusic.setVolume(volume);
+        gameMusic.setVolume(volume);
+        victoryMusic.setVolume(volume);
+        loseMusic.setVolume(volume);
 
-        PREFS.putFloat(VOLUME_PREF, volume);
+        pref.putFloat(VOLUME_PREF, volume);
     }
 
     /**
-     * This method retuns the volume
+     * Returns the volume
      *
      * @return the current volume as a float
      */
@@ -178,65 +235,4 @@ public float getVolume() {
     public boolean isMusicEnabled() {
         return musicEnabled;
     }
-
-    /**
-     * changes the music to the specified music if it isn't already playing
-     *
-     * @param music the music to play
-     */
-    public void changeMusic(Music music) {
-        if(music == Music.MENU_THEME && !lastNodePlayed.equals(MENU_MUSIC)) {
-            LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
-            stop(battleMusic);
-            stop(gameOverMusicL);
-            stop(gameOverMusicV);
-            play(menuMusic);
-            lastNodePlayed = menuMusic.getName();
-        } else if (music == Music.BATTLE_THEME && !lastNodePlayed.equals(BATTLE_MUSIC)) {
-            LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
-            stop(menuMusic);
-            stop(gameOverMusicL);
-            stop(gameOverMusicV);
-            play(battleMusic);
-            lastNodePlayed = battleMusic.getName();
-        } else if (music == Music.GAME_OVER_THEME_L && !lastNodePlayed.equals(GAME_OVER_MUSIC_L)) {
-            LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
-            stop(menuMusic);
-            stop(battleMusic);
-            stop(gameOverMusicV);
-            play(gameOverMusicL);
-            lastNodePlayed = gameOverMusicL.getName();
-        } else if (music == Music.GAME_OVER_THEME_V && !lastNodePlayed.equals(GAME_OVER_MUSIC_V)){
-            LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
-            stop(menuMusic);
-            stop(battleMusic);
-            stop(gameOverMusicL);
-            play(gameOverMusicV);
-            lastNodePlayed = gameOverMusicV.getName();
-        }
-    }
-
-    /**
-     * the method which receives the Event
-     *
-     * @param music the received Event
-     */
-    @Override
-    public void receivedEvent (MusicEvent music){
-        LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
-        switch (music.music()){
-            case MENU_THEME:
-                changeMusic(Music.MENU_THEME);
-                break;
-            case BATTLE_THEME:
-                changeMusic(Music.BATTLE_THEME);
-                break;
-            case GAME_OVER_THEME_L:
-                changeMusic(Music.GAME_OVER_THEME_L);
-                break;
-            case GAME_OVER_THEME_V:
-                changeMusic(Music.GAME_OVER_THEME_V);
-                break;
-        }
-    }
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/BattleshipApp.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.client;
 
 import com.jme3.app.DebugKeysAppState;
@@ -123,15 +116,10 @@ public class BattleshipApp extends SimpleApplication implements BattleshipClient
     private final ActionListener escapeListener = (name, isPressed, tpf) -> escape(isPressed);
 
     /**
-     * The Object which handles the background music
+     * Object handling the background music
      */
     private BackgroundMusic backgroundMusic;
 
-    /**
-     * The object that handles the main volume
-     */
-    private MainVolume mainVolume;
-
     static {
         // Configure logging
         LogManager manager = LogManager.getLogManager();
@@ -235,8 +223,6 @@ public void simpleInitApp() {
         setupStates();
         setupGui();
         serverConnection.connect();
-
-        mainVolume = new MainVolume(this);
         backgroundMusic = new BackgroundMusic(this);
         logic.addListener(backgroundMusic);
     }
@@ -329,6 +315,10 @@ public Draw getDraw() {
         return draw;
     }
 
+    public BackgroundMusic getBackgroundMusic() {
+        return backgroundMusic;
+    }
+
     /**
      * Handles a request to close the application.
      * If the request is initiated by pressing ESC, this parameter is true.
@@ -440,22 +430,4 @@ void errorDialog(String errorMessage) {
                      .build()
                      .open();
     }
-
-    /**
-     * this method returns the object which handles the background music
-     *
-     * @return BackgroundMusic
-     */
-    public BackgroundMusic getBackgroundMusic(){
-        return backgroundMusic;
-    }
-
-    /**
-     * this method returns the object which handles the main volume
-     *
-     * @return an object of MainVolume
-     */
-    public MainVolume getMainVolumeControl(){
-        return mainVolume;
-    }
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/BattleshipAppConfig.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.client;
 
 import com.jme3.math.ColorRGBA;

Projekte/battleship/client/src/main/java/pp/battleship/client/BattleshipAppState.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.client;
 
 import com.jme3.app.Application;

Projekte/battleship/client/src/main/java/pp/battleship/client/GameSound.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.client;
 
 import com.jme3.app.Application;
@@ -14,8 +7,8 @@
 import com.jme3.asset.AssetNotFoundException;
 import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioNode;
-import com.jme3.audio.AudioSource;
 import pp.battleship.notification.GameEventListener;
+import pp.battleship.notification.Sound;
 import pp.battleship.notification.SoundEvent;
 
 import java.lang.System.Logger;
@@ -31,16 +24,11 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     static final Logger LOGGER = System.getLogger(GameSound.class.getName());
     private static final Preferences PREFERENCES = getPreferences(GameSound.class);
     private static final String ENABLED_PREF = "enabled"; //NON-NLS
-    private static final String SOUND_VOLUME_PREF = "volume";
-
-    private float volume;
 
     private AudioNode splashSound;
     private AudioNode shipDestroyedSound;
     private AudioNode explosionSound;
-    private AudioNode rocketSound;
-
-    private BattleshipApp app;
+    private AudioNode missileLaunch;
 
     /**
      * Checks if sound is enabled in the preferences.
@@ -82,13 +70,10 @@ public void setEnabled(boolean enabled) {
     @Override
     public void initialize(AppStateManager stateManager, Application app) {
         super.initialize(stateManager, app);
-        this.app = (BattleshipApp) app;
         shipDestroyedSound = loadSound(app, "Sound/Effects/sunken.wav"); //NON-NLS
         splashSound = loadSound(app, "Sound/Effects/splash.wav"); //NON-NLS
         explosionSound = loadSound(app, "Sound/Effects/explosion.wav"); //NON-NLS
-        rocketSound = loadSound(app, "Sound/Effects/rocket.wav");
-
-        volume = PREFERENCES.getFloat(SOUND_VOLUME_PREF, 1.0f);
+        missileLaunch = loadSound(app, "Sound/Effects/missilefiring.wav"); //NON-NLS
     }
 
     /**
@@ -111,6 +96,14 @@ private AudioNode loadSound(Application app, String name) {
         return null;
     }
 
+    /**
+     * Plays the splash sound effect.
+     */
+    public void missileLaunch() {
+        if (isEnabled() && missileLaunch != null)
+            missileLaunch.playInstance();
+    }
+
     /**
      * Plays the splash sound effect.
      */
@@ -136,64 +129,17 @@ public void shipDestroyed() {
     }
 
     /**
-     * Plays sound effect when a rocket starts
-     */
-    public void rocket() {
-        if (isEnabled() && rocketSound != null)
-            rocketSound.playInstance();
-    }
-
-    /**
-     * this method sets the sound volume of the sounds
+     * Plays sound according to the received SoundEvent
      *
-     * @param volume the volume to be set to
+     * @param event the received SoundEvent
      */
-    public void setSoundVolume(float volume) {
-        float mainVolume = app.getMainVolumeControl().getMainVolume();
-        float calculatedVolume = volume * mainVolume;
-        shipDestroyedSound.setVolume(calculatedVolume);
-        splashSound.setVolume(calculatedVolume);
-        explosionSound.setVolume(calculatedVolume);
-        this.volume = volume;
-        PREFERENCES.putFloat(SOUND_VOLUME_PREF, volume);
-    }
-
-    /**
-     * this method will be used if the main volume changes
-     */
-    public void setSoundVolume() {
-        float mainVolume = app.getMainVolumeControl().getMainVolume();
-        shipDestroyedSound.setVolume(volume * mainVolume);
-        splashSound.setVolume(volume * mainVolume);
-        explosionSound.setVolume(volume * mainVolume);
-        rocketSound.setVolume(volume * mainVolume);
-        PREFERENCES.putFloat(SOUND_VOLUME_PREF, volume);
-    }
-
-    /**
-     * this method returns the sound
-     *
-     * @return
-     */
-    public float getVolume(){
-        return volume;
-    }
-
     @Override
     public void receivedEvent(SoundEvent event) {
         switch (event.sound()) {
-            case EXPLOSION :
-                explosion();
-                break;
-            case SPLASH :
-                splash();
-                break;
-            case DESTROYED_SHIP:
-                shipDestroyed();
-                break;
-            case ROCKET_FIRED:
-                rocket();
-                break;
+            case EXPLOSION -> explosion();
+            case SPLASH -> splash();
+            case DESTROYED_SHIP -> shipDestroyed();
+            case MISSILE_LAUNCH -> missileLaunch();
         }
     }
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/MainVolume.java

@@ -1,32 +0,0 @@
-package pp.battleship.client;
-
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.prefs.Preferences;
-
-public class MainVolume {
-    private static final Preferences PREFS = Preferences.userNodeForPackage(MainVolume.class);
-    private static final String MAIN_VOLUME_PREFS = "MainVolume";
-    static final Logger LOGGER = System.getLogger(MainVolume.class.getName());
-
-    private float mainVolume;
-
-    private BattleshipApp app;
-
-    public MainVolume(BattleshipApp app) {
-        this.mainVolume = PREFS.getFloat(MAIN_VOLUME_PREFS, 1.0f);
-        this.app = app;
-    }
-
-    public void setMainVolume(float mainVolume) {
-        LOGGER.log(Level.DEBUG, "setMainVolume: mainVolume = {0}", mainVolume);
-        app.getBackgroundMusic().setVolume();
-        app.getStateManager().getState(GameSound.class).setSoundVolume();
-        this.mainVolume = mainVolume;
-        PREFS.putFloat(MAIN_VOLUME_PREFS, mainVolume);
-    }
-
-    public float getMainVolume() {
-        return mainVolume;
-    }
-}

Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.client;
 
 import com.simsilica.lemur.Button;
@@ -36,14 +29,7 @@ class Menu extends Dialog {
     private final BattleshipApp app;
     private final Button loadButton = new Button(lookup("menu.map.load"));
     private final Button saveButton = new Button(lookup("menu.map.save"));
-
-    private static final double SLIDER_DELTA = 0.1;
-    private static final double SLIDER_MIN_VALUE = 0.0;
-    private static final double SLIDER_MAX_VALUE = 2.0;
-
     private final VersionedReference<Double> volumeRef;
-    private final VersionedReference<Double> soundVolumeRef;
-    private final VersionedReference<Double> mainVolumeRef;
 
     /**
      * Constructs the Menu dialog for the Battleship application.
@@ -54,26 +40,19 @@ public Menu(BattleshipApp app) {
         super(app.getDialogManager());
         this.app = app;
         addChild(new Label(lookup("battleship.name"), new ElementId("header"))); //NON-NLS
-
-        addChild(new Label(lookup("menu.main.volume"), new ElementId("label")));
-        Slider mainVolumeSlider = createSlider(app.getMainVolumeControl().getMainVolume());
-        addChild(mainVolumeSlider);
-        mainVolumeRef = mainVolumeSlider.getModel().createReference();
-
-        addChild(new Label(lookup("menu.sound.volume"), new ElementId("label")));
         addChild(new Checkbox(lookup("menu.sound-enabled"),
                               new StateCheckboxModel(app, GameSound.class)));
-        Slider soundSlider = createSlider(app.getStateManager().getState(GameSound.class).getVolume());
-        addChild(soundSlider);
-        soundVolumeRef = soundSlider.getModel().createReference();
-
-        addChild(new Label(lookup("menu.volume"), new ElementId("label")));
         Checkbox musicToggle = new Checkbox(lookup("menu.music.toggle"));
         musicToggle.setChecked(app.getBackgroundMusic().isMusicEnabled());
         musicToggle.addClickCommands(s -> toggleMusic());
         addChild(musicToggle);
-        Slider volumeSlider = createSlider(app.getBackgroundMusic().getVolume());
+
+        addChild(new Label(lookup("menu.music.volume"), new ElementId("slider_label")));
+        Slider volumeSlider = new Slider();
+        volumeSlider.setModel(new DefaultRangedValueModel(0.00, 1.00, app.getBackgroundMusic().getVolume()));
+        volumeSlider.setDelta(0.05);
         addChild(volumeSlider);
+
         volumeRef = volumeSlider.getModel().createReference();
 
         addChild(loadButton)
@@ -84,70 +63,34 @@ public Menu(BattleshipApp app) {
                 .addClickCommands(s -> ifTopDialog(this::close));
         addChild(new Button(lookup("menu.quit")))
                 .addClickCommands(s -> ifTopDialog(app::closeApp));
+
         update();
     }
 
     /**
-     * this method creates a slider to be used in the menu
+     * Updates the volume when the slider is moved
      *
-     * @param relativePosition the position of the regulator on the slider
-     * @return the creates slider
-     */
-    private Slider createSlider(double relativePosition){
-        Slider slider = new Slider();
-        slider.setModel(new DefaultRangedValueModel(SLIDER_MIN_VALUE, SLIDER_MAX_VALUE, relativePosition));
-        slider.setDelta(SLIDER_DELTA);
-        return slider;
-    }
-
-    /**
-     * this method is used update the volume when there is a change in the slider
      * @param tpf time per frame
      */
     @Override
-    public void update(float tpf){
-        if(volumeRef.update()){
+    public void update(float tpf) {
+        if (volumeRef.update()) {
             double newVolume = volumeRef.get();
-            adjustMusicVolume(newVolume);
-        }
-        else if (soundVolumeRef.update()) {
-            double newSoundVolume = soundVolumeRef.get();
-            adjustSoundVolume(newSoundVolume);
-        } else if (mainVolumeRef.update()) {
-            double newMainVolume = mainVolumeRef.get();
-            adjustMainVolume(newMainVolume);
+            adjustVolume(newVolume);
         }
     }
 
     /**
-     * this method adjusts the main volume
-     *
-     * @param newVolume the volume to be set as main volume
-     */
-    private void adjustMainVolume(double newVolume) {
-        app.getMainVolumeControl().setMainVolume((float) newVolume);
-    }
-
-    /**
-     * this method adjust the volume for the background music
+     * Adjusts the volume for the background music
      *
      * @param volume is the double value of the volume
      */
-    private void adjustMusicVolume(double volume) {
+    private void adjustVolume(double volume) {
         app.getBackgroundMusic().setVolume((float) volume);
     }
 
     /**
-     * this method adjusts the volume for the sound
-     *
-     * @param volume is a double value of the sound volume
-     */
-    private void adjustSoundVolume(double volume) {
-        app.getStateManager().getState(GameSound.class).setSoundVolume((float) volume);
-    }
-
-    /**
-     * this method toggles the background music on and off
+     * Toggles the background music on and off
      */
     private void toggleMusic() {
         app.getBackgroundMusic().toggleMusic();

Projekte/battleship/client/src/main/java/pp/battleship/client/NetworkDialog.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.client;
 
 import com.simsilica.lemur.Checkbox;
@@ -12,10 +5,10 @@
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.TextField;
 import com.simsilica.lemur.component.SpringGridLayout;
-import pp.battleship.client.server.BattleshipServer;
 import pp.dialog.Dialog;
 import pp.dialog.DialogBuilder;
 import pp.dialog.SimpleDialog;
+import server.BattleshipServer;
 
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
@@ -53,9 +46,9 @@ class NetworkDialog extends SimpleDialog {
         host.setPreferredWidth(400f);
         port.setSingleLine(true);
 
-        Checkbox serverHost = new Checkbox(lookup("host.own.server"));
-        serverHost.setChecked(false);
-        serverHost.addClickCommands(s -> toggleServerHost());
+        Checkbox hostServer = new Checkbox(lookup("start.own.server"));
+        hostServer.setChecked(false);
+        hostServer.addClickCommands(s -> toggleOwnServer());
 
         final BattleshipApp app = network.getApp();
         final Container input = new Container(new SpringGridLayout());
@@ -63,7 +56,7 @@ class NetworkDialog extends SimpleDialog {
         input.addChild(host, 1);
         input.addChild(new Label(lookup("port.number") + ":  "));
         input.addChild(port, 1);
-        input.addChild(serverHost);
+        input.addChild(hostServer);
 
         DialogBuilder.simple(app.getDialogManager())
                      .setTitle(lookup("server.dialog"))
@@ -76,10 +69,10 @@ class NetworkDialog extends SimpleDialog {
     }
 
     /**
-     * Handles the action for the connect button in the connection dialog.
+     * Handles the action for establishing the connection to a server.
      * Tries to parse the port number and initiate connection to the server.
      */
-    private void connectServer() {
+    private void connectToServer() {
         LOGGER.log(Level.INFO, "connect to host={0}, port={1}", host, port); //NON-NLS
         try {
             hostname = host.getText().trim().isEmpty() ? LOCALHOST : host.getText();
@@ -92,41 +85,6 @@ private void connectServer() {
         }
     }
 
-    /**
-     * This method will start a server or just connect to one based on the boolean hostServer
-     */
-    private void connect() {
-        if(hostServer){
-            startServer();
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                LOGGER.log(Level.WARNING, e.getMessage(), e);
-            }
-            connectServer();
-        } else {
-            connectServer();
-        }
-    }
-
-    /**
-     * This method starts a server in a new thread
-     */
-    private void startServer() {
-        new Thread(() -> {
-            try{
-                BattleshipServer battleshipServer = new BattleshipServer(Integer.parseInt(port.getText()));
-                battleshipServer.run();
-            } catch (Exception e) {
-                LOGGER.log(Level.ERROR, e.getMessage(), e);
-            }
-        }).start();
-    }
-
-    private void toggleServerHost(){
-        hostServer = !hostServer;
-    }
-
     /**
      * Creates a dialog indicating that the connection is in progress.
      */
@@ -193,4 +151,46 @@ private void failure(Throwable e) {
         network.getApp().errorDialog(lookup("server.connection.failed"));
         network.getApp().setInfoText(e.getLocalizedMessage());
     }
+
+    /**
+     * Handles the action for the connect-button.
+     * If hostServer-Checkbox is active, starts a new Server on the clients machine, else tries to connect to existing server
+     */
+    private void connect() {
+        if (hostServer) {
+            startServer();
+            try {
+                Thread.sleep(1000);
+            }
+            catch (InterruptedException e) {
+                LOGGER.log(Level.WARNING, e.getMessage(), e);
+            }
+            connectToServer();
+        }
+        else {
+            connectToServer();
+        }
+    }
+
+    /**
+     * Starts a server on the clients machine
+     */
+    private void startServer() {
+        new Thread(() -> {
+            try {
+                BattleshipServer battleshipServer = new BattleshipServer(Integer.parseInt(port.getText()));
+                battleshipServer.run();
+            }
+            catch (Exception e) {
+                LOGGER.log(Level.ERROR, e);
+            }
+        }).start();
+    }
+
+    /**
+     * Handles the action for the hostServer-Checkbox
+     */
+    private void toggleOwnServer() {
+        hostServer = !hostServer;
+    }
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/NetworkSupport.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.client;
 
 import com.jme3.network.Client;

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/BattleAppState.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.client.gui;
 

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/EditorAppState.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.client.gui;
 

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/EffectHandler.java

@@ -1,179 +0,0 @@
-package pp.battleship.client.gui;
-
-import com.jme3.app.Application;
-import com.jme3.asset.AssetManager;
-import com.jme3.effect.ParticleEmitter;
-import com.jme3.effect.ParticleMesh;
-import com.jme3.effect.ParticleMesh.Type;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Node;
-import com.jme3.scene.control.AbstractControl;
-import pp.battleship.model.Shot;
-
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * This class is used to handle the effects for impacts
- */
-public class EffectHandler {
-
-    private final AssetManager assetManager;
-    static final Logger LOGGER = System.getLogger(EffectHandler.class.getName());
-
-    private Material particleMat;
-
-    /**
-     * the constructor is used to get the asset manager from the app
-     *
-     * @param app the main application
-     */
-    public EffectHandler(Application app) {
-        assetManager = app.getAssetManager();
-        particleMat = new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md");
-    }
-
-    /**
-     * creates a new HitEffect
-     *
-     * @param battleshipNode the node of the ship
-     * @param shot the shot which triggered the effect
-     */
-    public void createHitEffect(Node battleshipNode, Shot shot) {
-        createFieryEffect(battleshipNode,shot, "HitEffect", 30, 0.45f, 0.1f, -0.5f, 1f , 2f, false);
-    }
-
-    /**
-     * creates a new FireEffect
-     *
-     * @param battleshipNode the node of the ship
-     * @param shot the shot which triggered the effect
-     */
-    public void createFireEffect(Node battleshipNode, Shot shot) {
-        createFieryEffect(battleshipNode, shot, "FireEffect", 30, 0.1f, 0.05f, -0.9f, 1f , 2f, true);
-    }
-
-    /**
-     * creates a fiery type hit effect
-     *
-     * @param battleshipNode the ship to which the effect should be attached
-     * @param shot the shot that triggered the effect
-     * @param name the name of the particle emitter
-     * @param numOfParticle the overall numberOfParticles
-     * @param startSize the start size of the particles
-     * @param endSize the end size of the particles
-     * @param gravity the gravity of the particles
-     * @param lowLife the lowest lifetime of a particle
-     * @param highLife the maximum lifetime of a particle
-     * @param loop if the effect should be looped
-     */
-    public void createFieryEffect(Node battleshipNode, Shot shot, String name, int numOfParticle, float startSize, float endSize, float gravity,
-                                    float lowLife, float highLife, boolean loop) {
-        ParticleEmitter fieryEffect = new ParticleEmitter(name, Type.Triangle, numOfParticle);
-        fieryEffect.setMaterial(particleMat);
-        fieryEffect.setImagesX(2);
-        fieryEffect.setImagesY(2);
-        fieryEffect.setStartColor(ColorRGBA.Orange);
-        fieryEffect.setEndColor(ColorRGBA.Red);
-        fieryEffect.getParticleInfluencer().setInitialVelocity(new Vector3f(0,1,0));
-        fieryEffect.setStartSize(startSize);
-        fieryEffect.setEndSize(endSize);
-        fieryEffect.setGravity(0, gravity, 0);
-        fieryEffect.setLowLife(lowLife);
-        fieryEffect.setHighLife(highLife);
-
-        if(!loop) {
-            fieryEffect.setLocalTranslation(shot.getY() + 0.5f, 0 , shot.getX() + 0.5f);
-            fieryEffect.setParticlesPerSec(0);
-            fieryEffect.emitAllParticles();
-        } else {
-            fieryEffect.setLocalTranslation(shot.getY() + 0.5f, 0 , shot.getX() + 0.5f);
-            fieryEffect.getLocalTranslation().subtractLocal(battleshipNode.getLocalTranslation());
-            fieryEffect.setParticlesPerSec(10);
-        }
-
-        battleshipNode.attachChild(fieryEffect);
-        LOGGER.log(Level.DEBUG, "Created {0} at {1}", name ,fieryEffect.getLocalTranslation().toString());
-
-        fieryEffect.addControl(new EffectControl(fieryEffect, battleshipNode));
-    }
-
-    /**
-     * This method is used to create a miss effect at a certain location
-     */
-    public ParticleEmitter createMissEffect(Shot shot) {
-        ParticleEmitter missEffect = new ParticleEmitter("MissEffect", Type.Triangle, 15);
-        missEffect.setMaterial(particleMat);
-        missEffect.setImagesX(2);
-        missEffect.setImagesY(2);
-        missEffect.setStartColor(ColorRGBA.Blue);  // Water color
-        missEffect.setEndColor(ColorRGBA.Cyan);
-        missEffect.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 1, 0));
-        missEffect.setStartSize(0.3f);
-        missEffect.setEndSize(0.05f);
-        missEffect.setGravity(0, -0.1f, 0);
-        missEffect.setLowLife(0.5f);
-        missEffect.setHighLife(1.5f);
-        missEffect.setParticlesPerSec(0);
-        missEffect.setLocalTranslation(shot.getY() + 0.5f, 0 , shot.getX() + 0.5f);
-        missEffect.emitAllParticles();
-
-        missEffect.addControl(new EffectControl(missEffect));
-
-        return missEffect;
-    }
-
-    /**
-     * This inner class is used to control the effects
-     */
-    private static class EffectControl extends AbstractControl {
-        private final ParticleEmitter emitter;
-        private final Node parentNode;
-
-        /**
-         * this constructor is used to when the effect should be attached to a specific node
-         *
-         * @param emitter the Particle emitter to be controlled
-         * @param parentNode the node to be attached
-         */
-        public EffectControl(ParticleEmitter emitter, Node parentNode) {
-            this.emitter = emitter;
-            this.parentNode = parentNode;
-        }
-
-        /**
-         * This constructor is used when the effect shouldn't be attached to
-         * a specific node
-         *
-         * @param emitter the Particle emitter to be controlled
-         */
-        public EffectControl(ParticleEmitter emitter){
-            this.emitter = emitter;
-            this.parentNode = null;
-        }
-
-        /**
-         * The method which checks if the Effect is not rendered anymore so it can be removed
-         *
-         * @param tpf time per frame (in seconds)
-         */
-        @Override
-        protected void controlUpdate(float tpf) {
-            if (emitter.getParticlesPerSec() == 0 && emitter.getNumVisibleParticles() == 0) {
-                if (parentNode != null)
-                    parentNode.detachChild(emitter);
-            }
-        }
-
-        /**
-         * @param rm the RenderManager rendering the controlled Spatial (not null)
-         * @param vp the ViewPort being rendered (not null)
-         */
-        @Override
-        protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {}
-    }
-}

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/HitEffectHandler.java

@@ -0,0 +1,181 @@
+package pp.battleship.client.gui;
+
+import com.jme3.app.Application;
+import com.jme3.asset.AssetManager;
+import com.jme3.effect.ParticleEmitter;
+import com.jme3.effect.ParticleMesh.Type;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Node;
+import com.jme3.scene.control.AbstractControl;
+import pp.battleship.model.Shot;
+
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+
+public class HitEffectHandler {
+    private final AssetManager assetManager;
+    private static final Logger LOGGER = System.getLogger(HitEffectHandler.class.getName());
+
+    /**
+     * Constructor for the HitEffectHandler class
+     *
+     * @param app the main application
+     */
+    public HitEffectHandler(Application app) {
+        assetManager = app.getAssetManager();
+    }
+
+    /**
+     * Creates explosion, debris and fire effects when ship gets hit
+     *
+     * @param battleshipNode the node of the ship that gets hit and the effect should be attached to
+     * @param shot           The shot taken on a field
+     */
+    public void hitEffect(Node battleshipNode, Shot shot) {
+        //Explosion
+        ParticleEmitter explosion = new ParticleEmitter("Explosion", Type.Triangle, 30);
+        explosion.setMaterial(new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md"));
+        explosion.setImagesX(2);
+        explosion.setImagesY(2);
+        explosion.setStartColor(new ColorRGBA(0.96f, 0.82f, 0.6f, 1f));
+        explosion.setEndColor(new ColorRGBA(0.88f, 0.32f, 0.025f, 1f));
+        explosion.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 1, 0));
+        explosion.setStartSize(0.45f);
+        explosion.setEndSize(0.1f);
+        explosion.setGravity(0, -0.5f, 0);
+        explosion.setLowLife(1f);
+        explosion.setHighLife(3.5f);
+        explosion.setParticlesPerSec(0);
+        explosion.setLocalTranslation(shot.getY() + 0.5f, 0, shot.getX() + 0.5f);
+        explosion.emitAllParticles();
+
+        //Debris
+        ParticleEmitter debris = new ParticleEmitter("Debris", Type.Triangle, 6);
+        Material debrisMaterial = new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md");
+        debrisMaterial.setTexture("Texture", assetManager.loadTexture("Textures/Debris/debris.png"));
+        debris.setMaterial(debrisMaterial);
+        debris.setImagesX(2);
+        debris.setImagesY(2);
+        debris.setStartColor(ColorRGBA.White);
+        debris.setEndColor(ColorRGBA.White);
+        debris.getParticleInfluencer().setInitialVelocity(new Vector3f(0.25f, 2f, 0.25f));
+        debris.setStartSize(0.25f);
+        debris.setEndSize(0.1f);
+        debris.setGravity(0, 1.5f, 0);
+        debris.getParticleInfluencer().setVelocityVariation(0.3f);
+        debris.setLowLife(1f);
+        debris.setHighLife(3.5f);
+        debris.setParticlesPerSec(0);
+        debris.setLocalTranslation(shot.getY() + 0.5f, 0, shot.getX() + 0.5f);
+        debris.emitAllParticles();
+
+        //Fire
+        ParticleEmitter fire = new ParticleEmitter("Fire", Type.Triangle, 30);
+        Material fireMaterial = new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md");
+        fireMaterial.setTexture("Texture", assetManager.loadTexture("Textures/Fire/fire.png"));
+        fire.setMaterial(fireMaterial);
+        fire.setImagesX(2);
+        fire.setImagesY(2);
+        fire.setStartColor(ColorRGBA.Orange);
+        fire.setEndColor(ColorRGBA.Red);
+        fire.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 1.5f, 0));
+        fire.setStartSize(0.2f);
+        fire.setEndSize(0.05f);
+        fire.setLowLife(1f);
+        fire.setHighLife(2f);
+        fire.getParticleInfluencer().setVelocityVariation(0.2f);
+        fire.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
+        fire.getLocalTranslation().subtractLocal(battleshipNode.getLocalTranslation());
+        battleshipNode.attachChild(fire);
+        fire.emitAllParticles();
+
+//        LOGGER.log(Level.DEBUG, "Created HitEffect at {0}", explosion.getLocalTranslation().toString());
+//        LOGGER.log(Level.DEBUG, "Created HitEffect at {0}", debris.getLocalTranslation().toString());
+//        LOGGER.log(Level.INFO, "Created HitEffect at {0}", fire.getLocalTranslation().toString());
+
+        battleshipNode.attachChild(explosion);
+        explosion.addControl(new EffectControl(explosion, battleshipNode));
+        fire.addControl(new EffectControl(fire, battleshipNode));
+        battleshipNode.attachChild(debris);
+        debris.addControl(new EffectControl(debris, battleshipNode));
+    }
+
+    /**
+     * Creates a splash effect if the shot hits the water
+     *
+     * @param shot The shot taken on a field
+     */
+    public ParticleEmitter missEffect(Shot shot) {
+        ParticleEmitter missEffect = new ParticleEmitter("HitEffect", Type.Triangle, 45);
+        missEffect.setMaterial(new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md"));
+        missEffect.setImagesX(2);
+        missEffect.setImagesY(2);
+        missEffect.setStartColor(new ColorRGBA(0.067f, 0.06f, 0.37f, 0.87f));
+        missEffect.setEndColor(new ColorRGBA(0.32f, 0.55f, 0.87f, 0.79f));
+        missEffect.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 1, 0));
+        missEffect.setStartSize(0.1f);
+        missEffect.setEndSize(0.08f);
+        missEffect.setGravity(0, 0.36f, 0);
+        missEffect.setLowLife(0.7f);
+        missEffect.setHighLife(1.8f);
+        missEffect.setParticlesPerSec(0);
+        missEffect.setLocalTranslation(shot.getY() + 0.5f, 0, shot.getX() + 0.5f);
+
+        LOGGER.log(Level.DEBUG, "Created MissEffect at {0}", missEffect.getLocalTranslation().toString());
+
+        missEffect.emitAllParticles();
+        missEffect.addControl(new EffectControl(missEffect));
+        return missEffect;
+    }
+
+    /**
+     * Inner class to control effects
+     */
+    private static class EffectControl extends AbstractControl {
+        private final ParticleEmitter emitter;
+        private final Node parentNode;
+
+        /**
+         * Constructor used to attach effect to a node
+         *
+         * @param emitter    the particle emitter to be controlled
+         * @param parentNode the node to be attached
+         */
+        public EffectControl(ParticleEmitter emitter, Node parentNode) {
+            this.emitter = emitter;
+            this.parentNode = parentNode;
+        }
+
+        /**
+         * Constructor used if the effect shouldn't be attached to a node
+         *
+         * @param emitter the particle emitter to be controlled
+         */
+        public EffectControl(ParticleEmitter emitter) {
+            this.emitter = emitter;
+            this.parentNode = null;
+        }
+
+        /**
+         * Checks if the Effect is not rendered anymore so it can be removed
+         *
+         * @param tpf time per frame (in seconds)
+         */
+        @Override
+        protected void controlUpdate(float tpf) {
+            if (emitter.getParticlesPerSec() == 0 && emitter.getNumVisibleParticles() == 0) {
+                if (parentNode != null)
+                    parentNode.detachChild(emitter);
+            }
+        }
+
+        /**
+         * @param rm the RenderManager rendering the controlled Spatial (not null)
+         * @param vp the ViewPort being rendered (not null)
+         */
+        @Override
+        protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {}
+    }
+}

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/MapView.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.client.gui;
 

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/MapViewSynchronizer.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.client.gui;
 
@@ -16,7 +11,9 @@
 import pp.battleship.model.Shell;
 import pp.battleship.model.Shot;
 import pp.util.Position;
+
 import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
 
 /**
  * Synchronizes the visual representation of the ship map with the game model.
@@ -29,10 +26,9 @@ class MapViewSynchronizer extends ShipMapSynchronizer {
     private static final float SHOT_DEPTH = -2f;
     private static final float SHIP_DEPTH = 0f;
     private static final float INDENT = 4f;
-    private static final float SHELL_DEPTH = 8f;
-
-    private static final float SHELL_SIZE = 0.75f;
-    private static final float SHELL_CENTERED_IN_MAP_GRID = 0.0625f;
+    private static final float MISSILE_DEPTH = 6f;
+    private static final float MISSILE_SIZE = 0.8f;
+    private static final float MISSILE_CENTERED_IN_MAP_GRID = 0.0625f;
 
     // Colors used for different visual elements
     private static final ColorRGBA HIT_COLOR = ColorRGBA.Red;
@@ -67,17 +63,14 @@ public MapViewSynchronizer(MapView view) {
      */
     @Override
     public Spatial visit(Shot shot) {
-        LOGGER.log(Logger.Level.DEBUG, "Visiting " + shot);
+        LOGGER.log(Level.DEBUG, "visiting" + shot);
         // Convert the shot's model coordinates to view coordinates
         final Position p1 = view.modelToView(shot.getX(), shot.getY());
         final Position p2 = view.modelToView(shot.getX() + 1, shot.getY() + 1);
         final ColorRGBA color = shot.isHit() ? HIT_COLOR : MISS_COLOR;
 
         // Create and return a rectangle representing the shot
-        return view.getApp().getDraw().makeRectangle(p1.getX(), p1.getY(),
-                                                     SHOT_DEPTH,
-                                                     p2.getX() - p1.getX(), p2.getY() - p1.getY(),
-                                                     color);
+        return view.getApp().getDraw().makeRectangle(p1.getX(), p1.getY(), SHOT_DEPTH, p2.getX() - p1.getX(), p2.getY() - p1.getY(), color);
     }
 
     /**
@@ -120,24 +113,29 @@ public Spatial visit(Battleship ship) {
     }
 
     /**
-     * this method will create a representation of a shell in the map
+     * Creates a visual representation on the map
      *
      * @param shell the Shell element to visit
-     * @return the node the representation is attached to
+     * @return the node the visual representation gets attached to.
      */
     @Override
     public Spatial visit(Shell shell) {
         LOGGER.log(Logger.Level.DEBUG, "Visiting {0}", shell);
-        final Node shellNode = new Node("shell");
+        final Node missileNode = new Node("missile");
         final Position p1 = view.modelToView(shell.getX(), shell.getY());
-        final Position p2 = view.modelToView(shell.getX() + SHELL_SIZE, shell.getY() + SHELL_SIZE);
+        final Position p2 = view.modelToView(shell.getX() + MISSILE_SIZE, shell.getY() + MISSILE_SIZE);
 
-        final Position startPosition = view.modelToView(SHELL_CENTERED_IN_MAP_GRID, SHELL_CENTERED_IN_MAP_GRID);
+        final float x1 = p1.getX() + INDENT;
+        final float y1 = p1.getY() + INDENT;
+        final float x2 = p2.getX() - INDENT;
+        final float y2 = p2.getY() - INDENT;
 
-        shellNode.attachChild(view.getApp().getDraw().makeRectangle(startPosition.getX(), startPosition.getY(), SHELL_DEPTH, p2.getX() - p1.getX(), p2.getY() - p1.getY(), ColorRGBA.Black));
-        shellNode.setLocalTranslation(startPosition.getX(), startPosition.getY(), SHELL_DEPTH);
-        shellNode.addControl(new ShellMapControl(p1, view.getApp(), new IntPoint(shell.getX(), shell.getY())));
-        return shellNode;
+        final Position startPosition = view.modelToView(MISSILE_CENTERED_IN_MAP_GRID, MISSILE_CENTERED_IN_MAP_GRID);
+
+        missileNode.attachChild(view.getApp().getDraw().makeRectangle(startPosition.getX(), startPosition.getY(), MISSILE_DEPTH, p2.getX() - p1.getX(), p2.getY() - p1.getY(), ColorRGBA.DarkGray));
+        missileNode.setLocalTranslation(startPosition.getX(), startPosition.getY(), MISSILE_DEPTH);
+        missileNode.addControl(new ShellMapControl(p1, view.getApp(), new IntPoint(shell.getX(), shell.getY())));
+        return missileNode;
     }
 
     /**
@@ -151,7 +149,7 @@ public Spatial visit(Shell shell) {
      * @return a Geometry representing the line
      */
     private Geometry shipLine(float x1, float y1, float x2, float y2, ColorRGBA color) {
-        LOGGER.log(Logger.Level.DEBUG, "created ship line");
+        LOGGER.log(Logger.Level.DEBUG, "created Ship line");
         return view.getApp().getDraw().makeFatLine(x1, y1, x2, y2, SHIP_DEPTH, color, SHIP_LINE_WIDTH);
     }
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaAppState.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.client.gui;
 

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaSynchronizer.java

@@ -1,20 +1,24 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.client.gui;
 
 import com.jme3.material.Material;
 import com.jme3.material.RenderState;
+import com.jme3.material.RenderState.BlendMode;
+import com.jme3.math.ColorRGBA;
 import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
+import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import com.jme3.scene.shape.Box;
+import com.jme3.scene.shape.Cylinder;
 import pp.battleship.client.BattleshipApp;
-import pp.battleship.model.*;
+import pp.battleship.model.Battleship;
+import pp.battleship.model.Shell;
+import pp.battleship.model.Rotation;
+import pp.battleship.model.ShipMap;
+import pp.battleship.model.Shot;
 
 import static java.util.Objects.requireNonNull;
 import static pp.util.FloatMath.HALF_PI;
@@ -29,14 +33,20 @@
 class SeaSynchronizer extends ShipMapSynchronizer {
     private static final String UNSHADED = "Common/MatDefs/Misc/Unshaded.j3md"; //NON-NLS
     private static final String KING_GEORGE_V_MODEL = "Models/KingGeorgeV/KingGeorgeV.j3o";
-    private static final String UBOAT = "Models/UBoat/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.obj"; //NON-NLS
-    private static final String BATTLE_SHIP_MODERN = "Models/BattleShipModern/Destroyer.j3o";
-    private static final String BATTLE_SHIP_MODERN_TEXTURE = "Models/BattleShipModern/BattleshipC.jpg";
-    private static final String PATROL_BOAT = "Models/PatrolBoat/12219_boat_v2_L2.obj";
-    private static final String SHELL_ROCKET = "Models/Rocket/Rocket.obj";
+    private static final String UBOAT_MODEL = "Models/UBOAT/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.obj";
+    private static final String PATROL_BOAT_MODEL = "Models/PATROL_BOAT/12219_boat_v2_L2.obj";
+    private static final String MODERN_BATTLESHIP_MODEL = "Models/BATTLESHIP/10619_Battleship.obj";
+    private static final String MODERN_BATTLESHIP_TEXTURES = "Models/BATTLESHIP/BattleshipC.jpg";
+    private static final String MISSILE_MODEL = "Models/Missile/AIM120D.obj";
+    private static final String MISSILE_TEXTURE = "Models/Missile/texture.png";
+    private static final String COLOR = "Color"; //NON-NLS
     private static final String SHIP = "ship"; //NON-NLS
-    private static final String SHELL = "shell";
-    private final EffectHandler effectHandler;
+    private static final String SHOT = "shot"; //NON-NLS
+    private static final String MISSILE = "missile"; //NON-NLS
+    private static final ColorRGBA BOX_COLOR = ColorRGBA.Gray;
+    private static final ColorRGBA SPLASH_COLOR = new ColorRGBA(0f, 0f, 1f, 0.4f);
+    private static final ColorRGBA HIT_COLOR = new ColorRGBA(1f, 0f, 0f, 0.4f);
+    private final HitEffectHandler hitEffectHandler;
 
     private final ShipMap map;
     private final BattleshipApp app;
@@ -52,7 +62,7 @@ public SeaSynchronizer(BattleshipApp app, Node root, ShipMap map) {
         super(app.getGameLogic().getOwnMap(), root);
         this.app = app;
         this.map = map;
-        effectHandler = new EffectHandler(app);
+        hitEffectHandler = new HitEffectHandler(app);
         addExisting();
     }
 
@@ -66,7 +76,7 @@ public SeaSynchronizer(BattleshipApp app, Node root, ShipMap map) {
      */
     @Override
     public Spatial visit(Shot shot) {
-        return shot.isHit() ? handleHit(shot) : effectHandler.createMissEffect(shot);
+        return shot.isHit() ? handleHit(shot) : hitEffectHandler.missEffect(shot);
     }
 
     /**
@@ -81,12 +91,33 @@ private Spatial handleHit(Shot shot) {
         final Battleship ship = requireNonNull(map.findShipAt(shot), "Missing ship");
         final Node shipNode = requireNonNull((Node) getSpatial(ship), "Missing ship node");
 
-        effectHandler.createHitEffect(shipNode, shot);
-        effectHandler.createFireEffect(shipNode, shot);
+        hitEffectHandler.hitEffect(shipNode, shot);
 
         return null;
     }
 
+    /**
+     * Creates a cylinder geometry representing the specified shot.
+     * The appearance of the cylinder depends on whether the shot is a hit or a miss.
+     *
+     * @param shot the shot to be represented
+     * @return the geometry representing the shot
+     */
+    private Geometry createCylinder(Shot shot) {
+        final ColorRGBA color = shot.isHit() ? HIT_COLOR : SPLASH_COLOR;
+        final float height = shot.isHit() ? 1.2f : 0.1f;
+
+        final Cylinder cylinder = new Cylinder(2, 20, 0.45f, height, true);
+        final Geometry geometry = new Geometry(SHOT, cylinder);
+
+        geometry.setMaterial(createColoredMaterial(color));
+        geometry.rotate(HALF_PI, 0f, 0f);
+        // compute the center of the shot in world coordinates
+        geometry.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
+
+        return geometry;
+    }
+
     /**
      * Visits a {@link Battleship} and creates a graphical representation of it.
      * The representation is either a 3D model or a simple box depending on the
@@ -108,41 +139,23 @@ public Spatial visit(Battleship ship) {
     }
 
     /**
-     * Visits a shell and creates a graphical representation
+     * Visits a Shell and creates a graphical representation of it.
      *
-     * @param shell the Shell element to visit
-     * @return the node containing the graphical representation
+     * @param shell the Shell to be represented
+     * @return the node containing the graphical representation of the Shell
      */
     @Override
-    public Spatial visit(Shell shell){
-        final Node node = new Node(SHELL);
-        node.attachChild(createRocket());
+    public Spatial visit(Shell shell) {
+        final Node node = new Node(MISSILE);
+        node.attachChild(createMissile());
 
         final float x = shell.getY();
         final float z = shell.getX();
-
         node.setLocalTranslation(x + 0.5f, 10f, z + 0.5f);
-        ShellControl shellControl = new ShellControl(shell, app);
-        node.addControl(shellControl);
+        node.addControl(new ShellControl(shell, app));
         return node;
     }
 
-    /**
-     * creates the spatial representation of a rocket
-     *
-     * @return a spatial the rocket
-     */
-    private Spatial createRocket() {
-        final Spatial model = app.getAssetManager().loadModel(SHELL_ROCKET);
-
-        model.rotate(PI, 0f, 0f);
-        model.scale(0.002f);
-        model.setShadowMode(ShadowMode.CastAndReceive);
-        model.move(0, 0, 0);
-
-        return model;
-    }
-
     /**
      * Creates the appropriate graphical representation of the specified battleship.
      * The representation is either a detailed model or a simple box based on the length of the ship.
@@ -154,12 +167,48 @@ private Spatial createShip(Battleship ship) {
         return switch (ship.getLength()) {
             case 1 -> createPatrolBoat(ship);
             case 2 -> createModernBattleship(ship);
-            case 3 -> createUBoat(ship);
+            case 3 -> createUboat(ship);
             case 4 -> createBattleship(ship);
-            default -> throw new IllegalArgumentException("Ship length must be between 1 and 4 units long");
+            default -> createBox(ship);
         };
     }
 
+    /**
+     * Creates a simple box to represent a battleship that is not of the "King George V" type.
+     *
+     * @param ship the battleship to be represented
+     * @return the geometry representing the battleship as a box
+     */
+    private Spatial createBox(Battleship ship) {
+        final Box box = new Box(0.5f * (ship.getMaxY() - ship.getMinY()) + 0.3f,
+                                0.3f,
+                                0.5f * (ship.getMaxX() - ship.getMinX()) + 0.3f);
+        final Geometry geometry = new Geometry(SHIP, box);
+        geometry.setMaterial(createColoredMaterial(BOX_COLOR));
+        geometry.setShadowMode(ShadowMode.CastAndReceive);
+
+        return geometry;
+    }
+
+    /**
+     * Creates a new {@link Material} with the specified color.
+     * If the color includes transparency (i.e., alpha value less than 1),
+     * the material's render state is set to use alpha blending, allowing for
+     * semi-transparent rendering.
+     *
+     * @param color the {@link ColorRGBA} to be applied to the material. If the alpha value
+     *              of the color is less than 1, the material will support transparency.
+     * @return a {@link Material} instance configured with the specified color and,
+     * if necessary, alpha blending enabled.
+     */
+    private Material createColoredMaterial(ColorRGBA color) {
+        final Material material = new Material(app.getAssetManager(), UNSHADED);
+        if (color.getAlpha() < 1f)
+            material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
+        material.setColor(COLOR, color);
+        return material;
+    }
+
     /**
      * Creates a detailed 3D model to represent a "King George V" battleship.
      *
@@ -177,58 +226,80 @@ private Spatial createBattleship(Battleship ship) {
     }
 
     /**
-     * creates a detailed 3D model to represent an UBoat
+     * Creates a detailed 3D model to represent a modern battleship.
      *
-     * @param ship the ship to be represented
-     * @return the spatial representing the Uboat
+     * @param ship the battleship to be represented
+     * @return the spatial representing the battleship
      */
-    private Spatial createUBoat(Battleship ship) {
-        final Spatial model = app.getAssetManager().loadModel(UBOAT);
 
-        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
-        model.scale(0.5f);
-        model.setShadowMode(ShadowMode.CastAndReceive);
-        model.move(0, -0.3f, 0);
-
-        return model;
-    }
-
-    /**
-     * creates a detailed 3D model to represent the modern battleship
-     *
-     * @param ship the ship to be represented
-     * @return the spatial representing the Modern Battleship
-     */
     private Spatial createModernBattleship(Battleship ship) {
-        final Spatial model = app.getAssetManager().loadModel(BATTLE_SHIP_MODERN);
-
+        final Spatial model = app.getAssetManager().loadModel(MODERN_BATTLESHIP_MODEL);
         Material mat = new Material(app.getAssetManager(), UNSHADED);
-        mat.setTexture("ColorMap", app.getAssetManager().loadTexture(BATTLE_SHIP_MODERN_TEXTURE));
+        mat.setTexture("ColorMap", app.getAssetManager().loadTexture(MODERN_BATTLESHIP_TEXTURES));
         mat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Off);
         model.setMaterial(mat);
 
         model.setQueueBucket(RenderQueue.Bucket.Opaque);
 
-        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
-        model.scale(0.08f);
-        model.setLocalTranslation(0f, 0.2f, 0f);
+        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()) + HALF_PI, 0f);
+        model.scale(0.000075f);
         model.setShadowMode(ShadowMode.CastAndReceive);
-
+        model.move(0, 0.2f, 0);
         return model;
-
     }
 
     /**
-     * creates a detailed 3D model to represent the patrol boat
+     * Creates a detailed 3D model to represent a missile.
      *
-     * @param ship the ship to be represented
-     * @return the spatial representing the patrol boat
+     * @return the spatial representing the missile
      */
-    private Spatial createPatrolBoat(Battleship ship) {
-        final Spatial model = app.getAssetManager().loadModel(PATROL_BOAT);
+
+    private Spatial createMissile() {
+        final Spatial model = app.getAssetManager().loadModel(MISSILE_MODEL);
+        Material mat = new Material(app.getAssetManager(), UNSHADED);
+        mat.setTexture("ColorMap", app.getAssetManager().loadTexture(MISSILE_TEXTURE));
+        mat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Off);
+        model.setMaterial(mat);
+
+        model.setQueueBucket(RenderQueue.Bucket.Opaque);
+
+        model.rotate(-HALF_PI, 0, 0);
+        model.scale(0.009f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+        model.move(0, 0f, 0);
+        return model;
+    }
+
+    /**
+     * Creates a detailed 3D model to represent a Uboat.
+     *
+     * @param ship the battleship to be represented
+     * @return the spatial representing the Uboat
+     */
+
+    private Spatial createUboat(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(UBOAT_MODEL);
 
         model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
-        model.scale(0.0005f);
+        model.scale(0.45f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+        model.move(0, -0.25f, 0);
+
+        return model;
+    }
+
+    /**
+     * Creates a detailed 3D model to represent a Patrol boat.
+     *
+     * @param ship the battleship to be represented
+     * @return the spatial representing the Patrol boat
+     */
+
+    private Spatial createPatrolBoat(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(PATROL_BOAT_MODEL);
+
+        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
+        model.scale(0.00045f);
         model.setShadowMode(ShadowMode.CastAndReceive);
 
         return model;

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShellControl.java

@@ -1,32 +1,31 @@
 package pp.battleship.client.gui;
 
-import com.jme3.math.Quaternion;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.control.AbstractControl;
 import pp.battleship.client.BattleshipApp;
-import pp.battleship.message.client.AnimationEndMessage;
+import pp.battleship.message.client.EndAnimationMessage;
 import pp.battleship.model.IntPoint;
 import pp.battleship.model.Shell;
 
 import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
 
 /**
- * This class controls a 3D representation of a shell
+ * Class to control the 3D representation of a shell
  */
 public class ShellControl extends AbstractControl {
+
     private final Shell shell;
     private final BattleshipApp app;
-
-    private static final float MOVE_SPEED = 8.0f;
-
-    static final Logger LOGGER = System.getLogger(ShellControl.class.getName());
+    private static final float TRAVEL_SPEED = 8.5f;
+    static final Logger LOGGER = System.getLogger(BattleshipApp.class.getName());
 
     /**
-     * Constructor to create a new ShellControl object
+     * Constructor for ShellControl class
      *
-     * @param shell the shell to be displayed
-     * @param app the main application
+     * @param shell The Shell to be displayed
+     * @param app   the main application
      */
     public ShellControl(Shell shell, BattleshipApp app) {
         this.shell = shell;
@@ -34,19 +33,17 @@ public ShellControl(Shell shell, BattleshipApp app) {
     }
 
     /**
-     * this method moves the representation towards it destination
-     * and deletes it if it reaches its target
+     * Method to control movement of the Shell and remove it when target is reached
      *
      * @param tpf time per frame (in seconds)
      */
     @Override
-    protected void controlUpdate(float tpf) {
-        spatial.move(0, -MOVE_SPEED * tpf, 0);
-        spatial.rotate(0f, 0.05f, 0f);
-        //LOGGER.log(System.Logger.Level.DEBUG, "moved rocket {0}", spatial.getLocalTranslation().getY());
-        if (spatial.getLocalTranslation().getY() <= 1.5){
+    public void controlUpdate(float tpf) {
+        //LOGGER.log(Level.DEBUG, "missile at x=" + shell.getX() + ", y=" + shell.getY());
+        spatial.move(0, -TRAVEL_SPEED * tpf, 0);
+        if (spatial.getLocalTranslation().getY() <= 0.2) {
             spatial.getParent().detachChild(spatial);
-            app.getGameLogic().send(new AnimationEndMessage(new IntPoint(shell.getX(), shell.getY())));
+            app.getGameLogic().send(new EndAnimationMessage(new IntPoint(shell.getX(), shell.getY())));
         }
     }
 

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShellMapControl.java

@@ -5,46 +5,45 @@
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.control.AbstractControl;
 import pp.battleship.client.BattleshipApp;
-import pp.battleship.message.client.AnimationEndMessage;
+import pp.battleship.message.client.EndAnimationMessage;
 import pp.battleship.model.IntPoint;
 import pp.util.Position;
 
 /**
- * This class controls a ShellMap element
+ * Class to control the 2D representation of a shell
  */
 public class ShellMapControl extends AbstractControl {
     private final Position position;
     private final IntPoint pos;
-    private static final Vector3f VECTOR = new Vector3f();
+    private static final Vector3f VECTOR_3_F = new Vector3f();
     private final BattleshipApp app;
 
     /**
-     * constructs a new ShellMapControl object
+     * Constructor for ShellMapControl
      *
-     * @param position the position where the shell should move to on the map
-     * @param app the main application
-     * @param pos the position the then to render shot goes to
+     * @param position the target position of the shell
+     * @param app      the main application
+     * @param pos      the position the then to render shot goes to
      */
     public ShellMapControl(Position position, BattleshipApp app, IntPoint pos) {
         super();
         this.position = position;
         this.pos = pos;
         this.app = app;
-        VECTOR.set(new Vector3f(position.getX(), position.getY(), 0));
+        VECTOR_3_F.set(new Vector3f(position.getX(), position.getY(), 0));
     }
 
     /**
-     * this method moves the shell representation to its correct spot and removes it after
-     * it arrived at its destination
+     * Method to control movement of the Shell on the map and remove it when target is reached
      *
      * @param tpf time per frame (in seconds)
      */
     @Override
     protected void controlUpdate(float tpf) {
-        spatial.move(VECTOR.mult(tpf));
+        spatial.move(VECTOR_3_F.mult(tpf));
         if (spatial.getLocalTranslation().getX() >= position.getX() && spatial.getLocalTranslation().getY() >= position.getY()) {
             spatial.getParent().detachChild(spatial);
-            app.getGameLogic().send(new AnimationEndMessage(pos));
+            app.getGameLogic().send(new EndAnimationMessage(pos));
         }
     }
 

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShipControl.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.client.gui;
 
@@ -46,27 +41,16 @@ class ShipControl extends AbstractControl {
      */
     private final Quaternion pitch = new Quaternion();
 
-    /**
-     * the speed at which ships sink
-     */
-    private static final float SINKING_SPEED = -0.05f;
-
-    /**
-     * the threshold when ships should be removed from the scene if they sink below the value
-     */
-    private static final float SHIP_SINKING_REMOVE_THRESHOLD = -0.6f;
-
     /**
      * The current time within the oscillation cycle, used to calculate the ship's pitch angle.
      */
     private float time;
-
     /**
-     * The ship to be controlled
+     * Ship to be controlled
      */
-    private  final Battleship battleship;
+    private final Battleship battleship;
 
-    static final Logger LOGGER = System.getLogger(ShipControl.class.getName());
+    private static final Logger LOGGER = System.getLogger(ShipControl.class.getName());
 
     /**
      * Constructs a new ShipControl instance for the specified Battleship.
@@ -76,8 +60,7 @@ class ShipControl extends AbstractControl {
      * @param ship the Battleship object to control
      */
     public ShipControl(Battleship ship) {
-        battleship = ship;
-
+        this.battleship = ship;
         // Determine the axis of rotation based on the ship's orientation
         axis = switch (ship.getRot()) {
             case LEFT, RIGHT -> Vector3f.UNIT_X;
@@ -92,7 +75,6 @@ public ShipControl(Battleship ship) {
     /**
      * Updates the ship's pitch oscillation each frame. The ship's pitch is adjusted
      * to create a continuous tilting motion, simulating the effect of waves.
-     * And lets the ship sink if it is destroyed and removes it from the scene when it has completely sunk
      *
      * @param tpf time per frame (in seconds), used to calculate the new pitch angle
      */
@@ -101,12 +83,14 @@ protected void controlUpdate(float tpf) {
         // If spatial is null, do nothing
         if (spatial == null) return;
 
-        if (battleship.isDestroyed() && spatial.getLocalTranslation().getY() <= SHIP_SINKING_REMOVE_THRESHOLD) {
+        if (battleship.isDestroyed() && spatial.getLocalTranslation().getY() < -0.6f) {
             LOGGER.log(Level.INFO, "Ship removed {0}", spatial.getName());
             spatial.getParent().detachChild(spatial);
-        } else if (battleship.isDestroyed()) {
-            spatial.move(0, SINKING_SPEED * tpf, 0);
-        } else {
+        }
+        else if (battleship.isDestroyed()) {
+            spatial.move(0, -0.2f * tpf, 0);
+        }
+        else {
             // Update the time within the oscillation cycle
             time = (time + tpf) % cycle;
 
@@ -115,11 +99,10 @@ protected void controlUpdate(float tpf) {
 
             // Update the pitch Quaternion with the new angle
             pitch.fromAngleAxis(angle, axis);
-
-            // Apply the pitch rotation to the spatial
-            spatial.setLocalRotation(pitch);
         }
 
+        // Apply the pitch rotation to the spatial
+        spatial.setLocalRotation(pitch);
     }
 
     /**

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShipMapSynchronizer.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.client.gui;
 

Projekte/battleship/client/src/main/java/server/BattleshipServer.java

@@ -1,11 +1,6 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
 
-package pp.battleship.client.server;
+
+package server;
 
 import com.jme3.network.ConnectionListener;
 import com.jme3.network.HostedConnection;
@@ -18,11 +13,16 @@
 import pp.battleship.game.server.Player;
 import pp.battleship.game.server.ServerGameLogic;
 import pp.battleship.game.server.ServerSender;
-import pp.battleship.message.client.AnimationEndMessage;
 import pp.battleship.message.client.ClientMessage;
+import pp.battleship.message.client.EndAnimationMessage;
 import pp.battleship.message.client.MapMessage;
 import pp.battleship.message.client.ShootMessage;
-import pp.battleship.message.server.*;
+import pp.battleship.message.server.EffectMessage;
+import pp.battleship.message.server.GameDetails;
+import pp.battleship.message.server.ServerMessage;
+import pp.battleship.message.server.StartAnimationMessage;
+import pp.battleship.message.server.StartBattleMessage;
+import pp.battleship.message.server.SwitchToBattleState;
 import pp.battleship.model.Battleship;
 import pp.battleship.model.IntPoint;
 import pp.battleship.model.Shot;
@@ -72,12 +72,18 @@ public BattleshipServer(int port) {
         logic = new ServerGameLogic(this, config);
     }
 
+    /**
+     * Runs a server
+     */
     public void run() {
         startServer();
         while (true)
             processNextMessage();
     }
 
+    /**
+     * Starts a server
+     */
     private void startServer() {
         try {
             LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS
@@ -93,6 +99,9 @@ private void startServer() {
         }
     }
 
+    /**
+     * Processes next received message
+     */
     private void processNextMessage() {
         try {
             pendingMessages.take().process(logic);
@@ -103,6 +112,9 @@ private void processNextMessage() {
         }
     }
 
+    /**
+     * Registers all serializable classes
+     */
     private void initializeSerializables() {
         Serializer.registerClass(GameDetails.class);
         Serializer.registerClass(StartBattleMessage.class);
@@ -112,18 +124,26 @@ private void initializeSerializables() {
         Serializer.registerClass(Battleship.class);
         Serializer.registerClass(IntPoint.class);
         Serializer.registerClass(Shot.class);
-        Serializer.registerClass(AnimationEndMessage.class);
-        Serializer.registerClass(AnimationStartMessage.class);
-        Serializer.registerClass(SwitchBattleState.class);
+        Serializer.registerClass(StartAnimationMessage.class);
+        Serializer.registerClass(EndAnimationMessage.class);
+        Serializer.registerClass(SwitchToBattleState.class);
     }
 
+    /**
+     * Registers all listeners
+     */
     private void registerListeners() {
         myServer.addMessageListener(this, MapMessage.class);
         myServer.addMessageListener(this, ShootMessage.class);
-        myServer.addMessageListener(this, AnimationEndMessage.class);
+        myServer.addMessageListener(this, EndAnimationMessage.class);
         myServer.addConnectionListener(this);
     }
 
+    /**
+     * Handles a received message
+     * @param source the connection the message comes from
+     * @param message the received message
+     */
     @Override
     public void messageReceived(HostedConnection source, Message message) {
         LOGGER.log(Level.INFO, "message received from {0}: {1}", source.getId(), message); //NON-NLS
@@ -131,12 +151,22 @@ public void messageReceived(HostedConnection source, Message message) {
             pendingMessages.add(new ReceivedMessage(clientMessage, source.getId()));
     }
 
+    /**
+     * Adds a new connection to a server
+     * @param server the server to add the connection to
+     * @param hostedConnection the connection to be added
+     */
     @Override
     public void connectionAdded(Server server, HostedConnection hostedConnection) {
         LOGGER.log(Level.INFO, "new connection {0}", hostedConnection); //NON-NLS
         logic.addPlayer(hostedConnection.getId());
     }
 
+    /**
+     * Removes a standing connection from a server
+     * @param server the server to add the connection to
+     * @param hostedConnection the connection to be added
+     */
     @Override
     public void connectionRemoved(Server server, HostedConnection hostedConnection) {
         LOGGER.log(Level.INFO, "connection closed: {0}", hostedConnection); //NON-NLS
@@ -149,6 +179,10 @@ public void connectionRemoved(Server server, HostedConnection hostedConnection)
         }
     }
 
+    /**
+     * Shuts down the server and terminates the application with the given exit code
+     * @param exitValue the exit status code
+     */
     private void exit(int exitValue) { //NON-NLS
         LOGGER.log(Level.INFO, "close request"); //NON-NLS
         if (myServer != null)

Projekte/battleship/client/src/main/java/server/ReceivedMessage.java

@@ -1,15 +1,15 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
 
-package pp.battleship.client.server;
+
+package server;
 
 import pp.battleship.message.client.ClientInterpreter;
 import pp.battleship.message.client.ClientMessage;
 
+/**
+ * Represents a message received from a client
+ * @param message the received message
+ * @param from the ID of the client that sent the message
+ */
 record ReceivedMessage(ClientMessage message, int from) {
     void process(ClientInterpreter interpreter) {
         message.accept(interpreter, from);

Projekte/battleship/client/src/main/resources/Models/BattleShipModern/README.txt

@@ -1,3 +0,0 @@
-based on:
-https://free3d.com/3d-model/battleship-v1--611736.html
-License: Free Personal Use Only

Projekte/battleship/client/src/main/resources/Models/Missile/AIM120D.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'AIM120D.blend'
+# Material Count: 1
+
+newmtl Material.006
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd texture.png

Projekte/battleship/client/src/main/resources/Models/Missile/README.txt

@@ -0,0 +1,2 @@
+AIM-120D Missile (Air-to-Air) by https://free3d.com/3d-model/aim-120d-shell-air-to-air-20348.html
+License: License for personal use

Projekte/battleship/client/src/main/resources/Models/PATROL_BOAT/12219_boat_v2_L2.mtl

@@ -6,7 +6,7 @@ newmtl white
 	Ni 1.5000
 	d 1.0000
 	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
+	Tf 1.0000 1.0000 1.0000
 	illum 2
 	Ka 0.6667 0.6667 0.6667
 	Kd 0.6667 0.6667 0.6667
@@ -18,7 +18,7 @@ newmtl boat_elements_black
 	Ni 1.5000
 	d 1.0000
 	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
+	Tf 1.0000 1.0000 1.0000
 	illum 2
 	Ka 0.0000 0.0000 0.0000
 	Kd 0.0000 0.0000 0.0000
@@ -30,7 +30,7 @@ newmtl boat_glass
 	Ni 7.0000
 	d 0.4000
 	Tr 0.6000
-	Tf 0.4000 0.4000 0.4000 
+	Tf 0.4000 0.4000 0.4000
 	illum 2
 	Ka 0.1059 0.1569 0.1451
 	Kd 0.1059 0.1569 0.1451
@@ -42,7 +42,7 @@ newmtl boat_screw_hooks_bronze
 	Ni 1.5000
 	d 1.0000
 	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
+	Tf 1.0000 1.0000 1.0000
 	illum 2
 	Ka 0.2941 0.2157 0.0510
 	Kd 0.2941 0.2157 0.0510
@@ -54,7 +54,7 @@ newmtl boat_silver
 	Ni 1.5000
 	d 1.0000
 	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
+	Tf 1.0000 1.0000 1.0000
 	illum 2
 	Ka 0.3333 0.3333 0.3333
 	Kd 0.3333 0.3333 0.3333
@@ -66,7 +66,7 @@ newmtl boat_buffer
 	Ni 1.5000
 	d 1.0000
 	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
+	Tf 1.0000 1.0000 1.0000
 	illum 2
 	Ka 1.0000 1.0000 1.0000
 	Kd 1.0000 1.0000 1.0000
@@ -80,7 +80,7 @@ newmtl boat_roof_accessory
 	Ni 1.5000
 	d 1.0000
 	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
+	Tf 1.0000 1.0000 1.0000
 	illum 2
 	Ka 1.0000 1.0000 1.0000
 	Kd 1.0000 1.0000 1.0000
@@ -94,7 +94,7 @@ newmtl boat_body
 	Ni 1.5000
 	d 1.0000
 	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
+	Tf 1.0000 1.0000 1.0000
 	illum 2
 	Ka 1.0000 1.0000 1.0000
 	Kd 1.0000 1.0000 1.0000

Projekte/battleship/client/src/main/resources/Models/PatrolBoat/README.txt

@@ -1,3 +0,0 @@
-based on:
-https://free3d.com/3d-model/boat-v2--225787.html
-License: Free Personal Use Only

Projekte/battleship/client/src/main/resources/Models/Rocket/Missile_AIM-120_D_[AMRAAM].mtl

@@ -1,250 +0,0 @@
-# 
-# Generated by Sweet Home 3D - ven. janv. 02 20:37:08 CET 2015
-# http://www.sweethome3d.com/
-# 
-
-newmtl FrontColorNoCulling
-illum 1
-Ka 0.2 0.2 0.2
-Kd 0.2 0.2 0.2
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl ForegroundColor
-illum 1
-Ka 0.2 0.2 0.2
-Kd 0.2 0.2 0.2
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl white
-illum 1
-Ka 0.48235294 0.5019608 0.5803922
-Kd 0.48235294 0.5019608 0.5803922
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl white_Cylinder_5
-illum 1
-Ka 0.47843137 0.49803922 0.5764706
-Kd 0.47843137 0.49803922 0.5764706
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl white_Cylinder_10
-illum 1
-Ka 0.8784314 0.8745098 0.8901961
-Kd 0.8784314 0.8745098 0.8901961
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl FrontColorNoCulling_11
-illum 1
-Ka 0.8784314 0.8745098 0.8901961
-Kd 0.8784314 0.8745098 0.8901961
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl ForegroundColor_12
-illum 1
-Ka 0.8784314 0.8745098 0.8901961
-Kd 0.8784314 0.8745098 0.8901961
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl white_Mesh_13
-illum 1
-Ka 0.6 0.6 0.6
-Kd 0.6 0.6 0.6
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl Cube_1_1_1
-illum 1
-Ka 0.0 0.0 0.0
-Kd 0.0 0.0 0.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cylinder_7_7
-illum 1
-Ka 0.4 0.4 0.4
-Kd 0.4 0.4 0.4
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cylinder_10_10
-illum 1
-Ka 0.8 0.4 0.0
-Kd 0.8 0.4 0.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cylinder_11_11
-illum 2
-Ka 0.2 0.2 0.2
-Kd 0.2 0.2 0.2
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl 12_12
-illum 1
-Ka 0.2 0.2 0.2
-Kd 0.2 0.2 0.2
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cube_1_1_1_Cube_1_1_1_38
-illum 1
-Ka 0.6 0.6 0.6
-Kd 0.6 0.6 0.6
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl white_Cylinder_58
-illum 1
-Ka 0.1882353 0.27058825 0.58431375
-Kd 0.1882353 0.27058825 0.58431375
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl white_Cylinder_59
-illum 1
-Ka 0.3137255 0.14901961 0.011764706
-Kd 0.3137255 0.14901961 0.011764706
-Ks 0.0 0.0 0.0
-Ns 0.0
-
-newmtl 1_1
-illum 2
-Ka 0.2 0.2 0.2
-Kd 1.0 1.0 1.0
-Ks 0.5 0.5 0.5
-Ns 64.0
-Ni 1.0
-d 0.48000002
-map_Kd Missile_AIM-120_D_[AMRAAM]_1_1.png
-
-newmtl Cube_1_2_2
-illum 1
-Ka 0.8 0.4 0.0
-Kd 0.8 0.4 0.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cylinder_4_4
-illum 2
-Ka 0.6 0.6 0.6
-Kd 0.6 0.6 0.6
-Ks 0.5 0.5 0.5
-Ns 64.0
-
-newmtl Cylinder_5_5
-illum 2
-Ka 0.8 0.8 0.0
-Kd 0.8 0.8 0.0
-Ks 0.5 0.5 0.5
-Ns 64.0
-
-newmtl Cylinder_6_6
-illum 2
-Ka 0.8784314 0.8745098 0.8901961
-Kd 0.8784314 0.8745098 0.8901961
-Ks 0.5 0.5 0.5
-Ns 64.0
-
-newmtl Cylinder_10_10_Cylinder_10_10_73
-illum 1
-Ka 0.2 0.2 0.2
-Kd 0.2 0.2 0.2
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl 11_11
-illum 1
-Ka 0.6 0.6 0.6
-Kd 0.6 0.6 0.6
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cube_1_1_1_Cube_1_1_1_76
-illum 1
-Ka 0.2 0.2 0.2
-Kd 1.0 1.0 1.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-Ni 1.0
-map_Kd Missile_AIM-120_D_[AMRAAM]_Cube_1_1_1_Cube_1_1_1_76.png
-
-newmtl Cylinder_2_2
-illum 2
-Ka 0.6 0.6 0.6
-Kd 0.6 0.6 0.6
-Ks 0.5 0.5 0.5
-Ns 64.0
-
-newmtl Cylinder_3_3
-illum 1
-Ka 0.4 0.4 0.0
-Kd 0.4 0.4 0.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cylinder_4_4_Cylinder_4_4_79
-illum 1
-Ka 0.0 0.0 0.0
-Kd 0.0 0.0 0.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cube_1_5_5
-illum 1
-Ka 0.2 0.2 0.2
-Kd 1.0 1.0 1.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-map_Kd Missile_AIM-120_D_[AMRAAM]_Cube_1_5_5.png
-
-newmtl Cube_1_6_6
-illum 1
-Ka 0.2 0.2 0.2
-Kd 1.0 1.0 1.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-Ni 1.0
-map_Kd Missile_AIM-120_D_[AMRAAM]_Cube_1_6_6.png
-
-newmtl Cylinder_1_1
-illum 1
-Ka 0.4 0.4 0.4
-Kd 0.4 0.4 0.4
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cube_1_5_5_Cube_1_5_5_86
-illum 1
-Ka 0.2 0.2 0.2
-Kd 0.2 0.2 0.2
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cube_1_6_6_Cube_1_6_6_87
-illum 1
-Ka 0.8 0.0 0.0
-Kd 0.8 0.0 0.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cylinder_7_7_Cylinder_7_7_88
-illum 1
-Ka 0.8 0.4 0.0
-Kd 0.8 0.4 0.0
-Ks 0.0 0.0 0.0
-Ns 1.0
-
-newmtl Cylinder_8_8
-illum 1
-Ka 0.4 0.6 0.0
-Kd 0.4 0.6 0.0
-Ks 0.0 0.0 0.0
-Ns 1.0

Projekte/battleship/client/src/main/resources/Models/Rocket/README.txt

@@ -1,3 +0,0 @@
-based on:
-https://free3d.com/de/3d-model/aim-120d-missile-51025.html
-License: Free Personal Use Only

Projekte/battleship/client/src/main/resources/Models/UBOAT/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.mtl

@@ -6,7 +6,7 @@ newmtl default
 	Ni 1.5000
 	d 1.0000
 	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
+	Tf 1.0000 1.0000 1.0000
 	illum 2
 	Ka 1.0000 1.0000 1.0000
 	Kd 1.0000 1.0000 1.0000

Projekte/battleship/client/src/main/resources/Models/UBoat/README.txt

@@ -1,3 +0,0 @@
-based on:
-https://free3d.com/3d-model/wwii-ship-german-type-ii-uboat-v2--700733.html
-License: Free Personal Use Only

Projekte/battleship/client/src/main/resources/Music/BattleTheme/README.txt

@@ -1,3 +0,0 @@
-based on
-https://opengameart.org/content/boss-battle-2-symphonic-metal
-License: CC0 (public domain)

Projekte/battleship/client/src/main/resources/Music/GameOver/Lose/README.txt

@@ -1,3 +0,0 @@
-based on
-https://opengameart.org/content/game-over-instrumental
-License: CC0 (public domain)

Projekte/battleship/client/src/main/resources/Music/GameOver/Victory/README.txt

@@ -1,3 +0,0 @@
-based on
-https://opengameart.org/content/victory-fanfare-short
-License: CC0 (public domain)

Projekte/battleship/client/src/main/resources/Music/MainMenu/README.txt

@@ -1,3 +0,0 @@
-based on
-https://opengameart.org/content/dark-intro
-License: CC0 (public domain)

Projekte/battleship/client/src/main/resources/Sound/Effects/README.txt

@@ -0,0 +1,2 @@
+Missile firing fl by NHMWretched (https://pixabay.com/sound-effects/missile-firing-fl-106655/)
+CCO License

Projekte/battleship/client/src/main/resources/Sound/Music/game/Credits.txt

@@ -0,0 +1 @@
+Aluminum | Roie Shpigler | https://artlist.io/royalty-free-music/song/aluminum/122360

Projekte/battleship/client/src/main/resources/Sound/Music/lose/Credits.txt

@@ -0,0 +1 @@
+A Touch of Dream | Max H. | https://artlist.io/royalty-free-music/song/a-touch-of-dream/126111

Projekte/battleship/client/src/main/resources/Sound/Music/menu/Crerdits.txt

@@ -0,0 +1,4 @@
+Epic Cinematic Trailer | ELITE by Alex-Productions | https://onsound.eu/
+Music promoted by https://www.chosic.com/free-music/all/
+Creative Commons CC BY 3.0
+https://creativecommons.org/licenses/by/3.0/

Projekte/battleship/client/src/main/resources/Sound/Music/victory/Crerdits.txt

@@ -0,0 +1 @@
+Victory march of Valor | Land_of_Books_YouTube | https://pixabay.com/users/land_of_books_youtube-7733644/s

Projekte/battleship/client/src/main/resources/Textures/Debris/README.txt

@@ -0,0 +1,2 @@
+Created using Metal Plates 13 from ambientCG.com,
+licensed under the Creative Commons CC0 1.0 Universal License.

Projekte/battleship/client/src/main/resources/Textures/Fire/README.txt

@@ -0,0 +1,2 @@
+https://www.rawpixel.com/image/13141087/png-fire-bonfire-illuminated-destruction-generated-image-rawpixel
+Licence: Free for personal use

Projekte/battleship/converter/src/main/java/pp/battleship/exporter/ModelExporter.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.exporter;
 
@@ -41,7 +36,7 @@ public static void main(String[] args) {
      */
     @Override
     public void simpleInitApp() {
-        export("Models/KingGeorgeV/King_George_V.obj", "KingGeorgeV.j3o"); //NON-NLS
+        export("Models/KingGeorgeV/King_George_V.obj", "Models/KingGeorgeV/KingGeorgeV.j3o"); //NON-NLS
 
         stop();
     }

Projekte/battleship/converter/src/main/resources/Models/KingGeorgeV/King_George_V.mtl

@@ -6,7 +6,7 @@ newmtl _King_George_V
 	Ni 1.5000
 	d 1.0000
 	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
+	Tf 1.0000 1.0000 1.0000
 	illum 2
 	Ka 1.0000 1.0000 1.0000
 	Kd 1.0000 1.0000 1.0000

Projekte/battleship/model/src/main/java/pp/battleship/BattleshipConfig.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship;
 
 import pp.util.config.Config;

Projekte/battleship/model/src/main/java/pp/battleship/Resources.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship;
 
 import java.util.ResourceBundle;

Projekte/battleship/model/src/main/java/pp/battleship/game/client/AnimationState.java

@@ -1,37 +1,44 @@
 package pp.battleship.game.client;
 
+import pp.battleship.message.client.EndAnimationMessage;
 import pp.battleship.message.server.EffectMessage;
-import pp.battleship.message.server.SwitchBattleState;
+import pp.battleship.message.server.SwitchToBattleState;
 import pp.battleship.model.IntPoint;
 import pp.battleship.model.Shell;
 import pp.battleship.model.ShipMap;
 import pp.battleship.notification.Music;
 import pp.battleship.notification.Sound;
 
+import java.lang.System.Logger.Level;
+
+/**
+ * Represents the state in which the animation is played
+ */
 public class AnimationState extends ClientState {
+
     private boolean myTurn;
 
     /**
-     * creates an object of AnimationState
+     * Constructor for the AnimationState class
      *
-     * @param logic the client logic
-     * @param myTurn a boolean containing if it is the clients turn
-     * @param position the position a shell should be created
+     * @param logic    the client logic
+     * @param turn     a boolean containing if it's the client's turn
+     * @param position the position a Shell gets created
      */
-    public AnimationState(ClientGameLogic logic, boolean myTurn, IntPoint position) {
+    public AnimationState(ClientGameLogic logic, boolean turn, IntPoint position) {
         super(logic);
-        logic.playMusic(Music.BATTLE_THEME);
-        this.myTurn = myTurn;
-        if(myTurn) {
+        logic.playMusic(Music.GAME_THEME);
+        myTurn = turn;
+        if (myTurn) {
             logic.getOpponentMap().add(new Shell(position));
-        }else {
+        }
+        else {
             logic.getOwnMap().add(new Shell(position));
-            logic.playSound(Sound.ROCKET_FIRED);
         }
     }
 
     /**
-     * This method makes sure the client renders the correct view
+     * Makes sure the client renders the correct view
      *
      * @return true
      */
@@ -47,14 +54,13 @@ boolean showBattle() {
      */
     @Override
     public void receivedEffect(EffectMessage msg) {
-        ClientGameLogic.LOGGER.log(System.Logger.Level.INFO, "report effect: {0}", msg); //NON-NLS
+        ClientGameLogic.LOGGER.log(Level.INFO, "report effect: {0}", msg); //NON-NLS
         playSound(msg);
         myTurn = msg.isMyTurn();
         logic.setInfoText(msg.getInfoTextKey());
         affectedMap(msg).add(msg.getShot());
-        if (destroyedOpponentShip(msg)) {
+        if (destroyedOpponentShip(msg))
             logic.getOpponentMap().add(msg.getDestroyedShip());
-        }
         if (msg.isGameOver()) {
             msg.getRemainingOpponentShips().forEach(logic.getOpponentMap()::add);
             logic.setState(new GameOverState(logic, msg.isGameLost()));
@@ -62,13 +68,13 @@ public void receivedEffect(EffectMessage msg) {
     }
 
     /**
-     * this method is used to change the client to the battle state again
+     * Sets the client back to the battle state
      *
-     * @param msg the message to process
+     * @param msg the received SwitchToBattleState message
      */
     @Override
-    public void receivedSwitchBattleState(SwitchBattleState msg) {
-        logic.setState(new BattleState(logic, msg.isTurn()));
+    public void receivedSwitchToBattleState(SwitchToBattleState msg) {
+        logic.setState(new BattleState(logic, msg.getTurn()));
     }
 
     /**

Projekte/battleship/model/src/main/java/pp/battleship/game/client/BattleState.java

@@ -1,16 +1,16 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 
 import pp.battleship.message.client.ShootMessage;
-import pp.battleship.message.server.AnimationStartMessage;
+import pp.battleship.message.server.EffectMessage;
+import pp.battleship.message.server.StartAnimationMessage;
 import pp.battleship.model.IntPoint;
+import pp.battleship.model.ShipMap;
 import pp.battleship.notification.Music;
+import pp.battleship.notification.Sound;
+
+import java.lang.System.Logger.Level;
 
 /**
  * Represents the state of the client where players take turns to attack each other's ships.
@@ -26,12 +26,12 @@ class BattleState extends ClientState {
      */
     public BattleState(ClientGameLogic logic, boolean myTurn) {
         super(logic);
-        logic.playMusic(Music.BATTLE_THEME);
+        logic.playMusic(Music.GAME_THEME);
         this.myTurn = myTurn;
     }
 
     /**
-     * This method makes sure the client renders the correct view
+     * Makes sure the client renders the correct view
      *
      * @return true
      */
@@ -40,6 +40,11 @@ public boolean showBattle() {
         return true;
     }
 
+    /**
+     * Triggers a shoot event if it's client's turn
+     *
+     * @param pos the position where the click occurred
+     */
     @Override
     public void clickOpponentMap(IntPoint pos) {
         if (!myTurn)
@@ -48,8 +53,14 @@ else if (logic.getOpponentMap().isValid(pos))
             logic.send(new ShootMessage(pos));
     }
 
+    /**
+     * Triggers an animation if StartAnimationMessage is received
+     *
+     * @param msg the received Startanimation message
+     */
     @Override
-    public void receivedAnimationStart(AnimationStartMessage msg){
+    public void receivedStartAnimation(StartAnimationMessage msg) {
         logic.setState(new AnimationState(logic, msg.isMyTurn(), msg.getPosition()));
+        logic.playSound(Sound.MISSILE_LAUNCH);
     }
 }

Projekte/battleship/model/src/main/java/pp/battleship/game/client/BattleshipClient.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 

Projekte/battleship/model/src/main/java/pp/battleship/game/client/ClientGameLogic.java

@@ -1,14 +1,14 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 
 import pp.battleship.message.client.ClientMessage;
-import pp.battleship.message.server.*;
+import pp.battleship.message.server.EffectMessage;
+import pp.battleship.message.server.GameDetails;
+import pp.battleship.message.server.ServerInterpreter;
+import pp.battleship.message.server.StartAnimationMessage;
+import pp.battleship.message.server.StartBattleMessage;
+import pp.battleship.message.server.SwitchToBattleState;
 import pp.battleship.model.IntPoint;
 import pp.battleship.model.ShipMap;
 import pp.battleship.model.dto.ShipMapDTO;
@@ -226,23 +226,23 @@ public void received(EffectMessage msg) {
     }
 
     /**
-     * Reports that the client should start an animation
+     * Reports that client should play an animation
      *
-     * @param msg the AnimationStartMessage received
+     * @param msg
      */
     @Override
-    public void received(AnimationStartMessage msg) {
-        state.receivedAnimationStart(msg);
+    public void received(StartAnimationMessage msg) {
+        state.receivedStartAnimation(msg);
     }
 
     /**
-     * Reports that the client should move to the battle state
+     * Reports that client should switch to the battle state
      *
-     * @param msg the SwitchBattleState received
+     * @param msg
      */
     @Override
-    public void received(SwitchBattleState msg) {
-        state.receivedSwitchBattleState(msg);
+    public void received(SwitchToBattleState msg) {
+        state.receivedSwitchToBattleState(msg);
     }
 
     /**
@@ -277,15 +277,6 @@ public void playSound(Sound sound) {
         notifyListeners(new SoundEvent(sound));
     }
 
-    /**
-     * Emits an event to play the specified music
-     *
-     * @param music the music to be played
-     */
-    public void playMusic(Music music) {
-        notifyListeners(new MusicEvent(music));
-    }
-
     /**
      * Loads a map from the specified file.
      *
@@ -332,7 +323,7 @@ public void saveMap(File file) throws IOException {
      *
      * @param msg the message to be sent
      */
-     public void send(ClientMessage msg) {
+    public void send(ClientMessage msg) {
         if (clientSender == null)
             LOGGER.log(Level.ERROR, "trying to send {0} with sender==null", msg); //NON-NLS
         else
@@ -380,4 +371,13 @@ public void notifyListeners(GameEvent event) {
     public void update(float delta) {
         state.update(delta);
     }
+
+    /**
+     * Triggers an event to play specified music
+     *
+     * @param music the music to be played
+     */
+    public void playMusic(Music music) {
+        notifyListeners(new MusicEvent(music));
+    }
 }

Projekte/battleship/model/src/main/java/pp/battleship/game/client/ClientSender.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 

Projekte/battleship/model/src/main/java/pp/battleship/game/client/ClientState.java

@@ -1,13 +1,12 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 
-import pp.battleship.message.server.*;
+import pp.battleship.message.server.EffectMessage;
+import pp.battleship.message.server.GameDetails;
+import pp.battleship.message.server.StartAnimationMessage;
+import pp.battleship.message.server.StartBattleMessage;
+import pp.battleship.message.server.SwitchToBattleState;
 import pp.battleship.model.IntPoint;
 
 import java.io.File;
@@ -164,21 +163,21 @@ void receivedEffect(EffectMessage msg) {
     }
 
     /**
-     * Reports that the client should start an animation
+     * Reports that client should switch to battle state
      *
-     * @param msg the AnimationStartMessage received
+     * @param msg the received SwitchToBattleState message
      */
-    void receivedAnimationStart(AnimationStartMessage msg){
-        ClientGameLogic.LOGGER.log(Level.ERROR, "receivedEffect not allowed in {0}", getName());
+    void receivedSwitchToBattleState(SwitchToBattleState msg) {
+        ClientGameLogic.LOGGER.log(Level.ERROR, "receivedSwitchToBattleState not allowed in {0}", getName());
     }
 
     /**
-     * Reports that the client should move to the battle state
+     * Reports that the client should start an animation
      *
-     * @param msg the SwitchBattleState received
+     * @param msg the received StartAnimation message
      */
-    void receivedSwitchBattleState(SwitchBattleState msg){
-        ClientGameLogic.LOGGER.log(Level.ERROR, "receivedSwitchBattleState not allowed in {0}", getName());
+    void receivedStartAnimation(StartAnimationMessage msg) {
+        ClientGameLogic.LOGGER.log(Level.ERROR, "receivedStartAnimation not allowed in {0}", getName());
     }
 
     /**

Projekte/battleship/model/src/main/java/pp/battleship/game/client/EditorState.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 
@@ -252,10 +247,10 @@ else if (!checkMapToLoad(dto)) {
     }
 
     /**
-     * This method is used to check if the loaded map is correct
+     * Checks if the provided map meets the requirements
      *
      * @param dto the data transfer object to check
-     * @return boolean if map is correct or not
+     * @return boolean if the map meets the requirements
      */
     private boolean checkMapToLoad(ShipMapDTO dto) {
         int mapWidth = dto.getWidth();
@@ -272,16 +267,15 @@ private boolean checkMapToLoad(ShipMapDTO dto) {
 
         // check if ships overlap
         List<Battleship> ships = dto.getShips();
-        for(Battleship ship:ships){
-            for(Battleship compareShip:ships){
-                if(!(ship==compareShip)){
-                    if(ship.collidesWith(compareShip)){
+        for (Battleship ship : ships) {
+            for (Battleship compareShip : ships) {
+                if (!(ship == compareShip)) {
+                    if (ship.collidesWith(compareShip)) {
                         return false;
                     }
                 }
             }
         }
-
         return true;
     }
 

Projekte/battleship/model/src/main/java/pp/battleship/game/client/GameOverState.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 
@@ -18,12 +13,13 @@ class GameOverState extends ClientState {
      *
      * @param logic the client game logic
      */
-    GameOverState(ClientGameLogic logic, boolean lost) {
+    GameOverState(ClientGameLogic logic, boolean loser) {
         super(logic);
-        if (lost){
-            logic.playMusic(Music.GAME_OVER_THEME_L);
-        } else {
-            logic.playMusic(Music.GAME_OVER_THEME_V);
+        if (loser) {
+            logic.playMusic(Music.LOSE_THEME);
+        }
+        else {
+            logic.playMusic(Music.VICTORY_THEME);
         }
     }
 

Projekte/battleship/model/src/main/java/pp/battleship/game/client/InitialState.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 
@@ -58,6 +53,11 @@ private void fillHarbor(GameDetails details) {
         }
     }
 
+    /**
+     * Checks if map may be saved to file
+     *
+     * @return false
+     */
     @Override
     public boolean maySaveMap() {
         return false;

Projekte/battleship/model/src/main/java/pp/battleship/game/client/ServerConnection.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 

Projekte/battleship/model/src/main/java/pp/battleship/game/client/WaitState.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.client;
 
@@ -41,14 +36,14 @@ public void receivedStartBattle(StartBattleMessage msg) {
     }
 
     /**
-     * This method will revert the client from wait state to editor state
-     * in case a wrong map was submitted
+     * Reverts the client back to the editor state if an invalid map is provided
      *
      * @param details the game details including map size and ships
      */
     @Override
-    public void receivedGameDetails(GameDetails details){
-        logic.setInfoText("invalid.map");
+    public void receivedGameDetails(GameDetails details) {
+        ClientGameLogic.LOGGER.log(Level.WARNING, "Invalid Map"); //NON-NLS
+        logic.setInfoText("map.invalid");
         logic.setState(new EditorState(logic));
     }
 }

Projekte/battleship/model/src/main/java/pp/battleship/game/server/Player.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.server;
 

Projekte/battleship/model/src/main/java/pp/battleship/game/server/ServerGameLogic.java

@@ -1,28 +1,22 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.game.server;
 
 import pp.battleship.BattleshipConfig;
-import pp.battleship.message.client.AnimationEndMessage;
 import pp.battleship.message.client.ClientInterpreter;
+import pp.battleship.message.client.EndAnimationMessage;
 import pp.battleship.message.client.MapMessage;
 import pp.battleship.message.client.ShootMessage;
-import pp.battleship.message.server.*;
+import pp.battleship.message.server.EffectMessage;
+import pp.battleship.message.server.GameDetails;
+import pp.battleship.message.server.ServerMessage;
+import pp.battleship.message.server.StartAnimationMessage;
+import pp.battleship.message.server.StartBattleMessage;
+import pp.battleship.message.server.SwitchToBattleState;
 import pp.battleship.model.Battleship;
 import pp.battleship.model.IntPoint;
-import pp.battleship.model.Rotation;
-import pp.util.Position;
 
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -41,8 +35,8 @@ public class ServerGameLogic implements ClientInterpreter {
     private Player activePlayer;
     private ServerState state = ServerState.WAIT;
 
-    private boolean player1AnimationReady = false;
-    private boolean player2AnimationReady = false;
+    private boolean p1AnimationFinished = false;
+    private boolean p2AnimationFinished = false;
 
     /**
      * Constructs a ServerGameLogic with the specified sender and configuration.
@@ -148,38 +142,69 @@ public void received(MapMessage msg, int from) {
         if (state != ServerState.SET_UP)
             LOGGER.log(Level.ERROR, "playerReady not allowed in {0}", state); //NON-NLS
         else if (!checkMap(msg, from)) {
-            LOGGER.log(Level.ERROR, "player submitted not allowed Map");
-            send(getPlayerById(from), new GameDetails(config));
+            LOGGER.log(Level.ERROR, "The submitted map is not allowed");
+            send(players.get(from), new GameDetails(config));
         }
         else
             playerReady(getPlayerById(from), msg.getShips());
     }
 
+    /**
+     * Handles the reception of an EndAnimation message
+     * @param msg received EndAnimation message
+     */
+    @Override
+    public void received(EndAnimationMessage msg, int from) {
+        if (state != ServerState.WAIT_ANIMATION)
+            LOGGER.log(Level.ERROR, "animation not allowed in {0}", state);
+        else if (getPlayerById(from) == players.get(0)) {
+            LOGGER.log(Level.DEBUG, "{0} set to true", getPlayerById(from));
+            p1AnimationFinished = true;
+            shoot(getPlayerById(from), msg.getPosition());
+        }
+        else if (getPlayerById(from) == players.get(1)) {
+            LOGGER.log(Level.DEBUG, "{0} set to true {1}", getPlayerById(from), getPlayerById(from).toString());
+            p2AnimationFinished = true;
+            shoot(getPlayerById(from), msg.getPosition());
+        }
+        if (p1AnimationFinished && p2AnimationFinished) {
+            setState(ServerState.BATTLE);
+            for (Player player : players)
+                send(player, new SwitchToBattleState(player == activePlayer));
+            p1AnimationFinished = false;
+            p2AnimationFinished = false;
+        }
+    }
+
     /**
      * Returns true if the map contains correct ship placement and is of the correct size
      *
-     * @param msg the received MapMessage of the player
+     * @param msg  the received MapMessage of the player
      * @param from the ID of the Player
      * @return a boolean based on if the transmitted map ist correct
      */
+
     private boolean checkMap(MapMessage msg, int from) {
         int mapWidth = getPlayerById(from).getMap().getWidth();
         int mapHeight = getPlayerById(from).getMap().getHeight();
 
+        if (mapHeight != 10 || mapWidth != 10)
+            return false;
+
         // check if ship is out of bounds
-        for (Battleship battleship : msg.getShips()){
-            if (battleship.getMaxX() >= mapWidth || battleship.getMinX() < 0 || battleship.getMaxY() >= mapHeight || battleship.getMinY() < 0) {
-                LOGGER.log(Level.ERROR, "Ship is out of bounds ({0})", battleship.toString());
+        for (Battleship ship : msg.getShips()) {
+            if (ship.getMaxX() >= mapWidth || ship.getMinX() < 0 || ship.getMaxY() >= mapHeight || ship.getMinY() < 0) {
+                LOGGER.log(Level.ERROR, "Ship is out of bounds ({0})", ship.toString());
                 return false;
             }
         }
 
         // check if ships overlap
         List<Battleship> ships = msg.getShips();
-        for(Battleship ship:ships){
-            for(Battleship compareShip:ships){
-                if(!(ship==compareShip)){
-                    if(ship.collidesWith(compareShip)){
+        for (Battleship ship : ships) {
+            for (Battleship compareShip : ships) {
+                if (!(ship == compareShip)) {
+                    if (ship.collidesWith(compareShip)) {
                         return false;
                     }
                 }
@@ -199,42 +224,12 @@ public void received(ShootMessage msg, int from) {
         if (state != ServerState.BATTLE)
             LOGGER.log(Level.ERROR, "shoot not allowed in {0}", state); //NON-NLS
         else
-            for (Player player : players){
-                send(player, new AnimationStartMessage(msg.getPosition(), player == activePlayer));
-                setState(ServerState.ANIMATION_WAIT);
+            for (Player player : players) {
+                send(player, new StartAnimationMessage(msg.getPosition(), player == activePlayer));
+                setState(ServerState.WAIT_ANIMATION);
             }
     }
 
-    /**
-     * Handles a clients message that it is done with the animation
-     *
-     * @param msg the AnimationEndMessage to be processed
-     * @param from the connection ID from which the message was received
-     */
-    @Override
-    public void received(AnimationEndMessage msg, int from){
-        if(state != ServerState.ANIMATION_WAIT) {
-            LOGGER.log(Level.ERROR, "animation not allowed in {0}", state);
-            return;
-        }
-        if(getPlayerById(from) == players.get(0)){
-            LOGGER.log(Level.DEBUG, "{0} set to true", getPlayerById(from));
-            player1AnimationReady = true;
-            shoot(getPlayerById(from), msg.getPosition());
-        } else if (getPlayerById(from) == players.get(1)){
-            LOGGER.log(Level.DEBUG, "{0} set to true {1}", getPlayerById(from), getPlayerById(from).toString());
-            player2AnimationReady = true;
-            shoot(getPlayerById(from), msg.getPosition());
-        }
-        if(player1AnimationReady && player2AnimationReady){
-            setState(ServerState.BATTLE);
-            for (Player player : players)
-                send(player, new SwitchBattleState(player == activePlayer));
-            player1AnimationReady = false;
-            player2AnimationReady = false;
-        }
-    }
-
     /**
      * Marks the player as ready and sets their ships.
      * Transitions the state to PLAY if both players are ready.
@@ -256,57 +251,86 @@ void playerReady(Player player, List<Battleship> ships) {
     }
 
     /**
-     * This method decides what effectMessage the client should get based on the shot made
-     * and switches the active player if a shot was missed
-     *
-     * @param p the player to be sent the message
-     * @param position the position where the shot would hit in the 2d map model
+     * Handles what Effect should be triggered based on the shot
+     * @param player the player receiving the message
+     * @param position the position the shot hit
      */
-    void shoot(Player p, IntPoint position) {
+    void shoot(Player player, IntPoint position) {
         final Battleship selectedShip;
-        if(p != activePlayer){
-            selectedShip = p.getMap().findShipAt(position);
-        } else {
-            selectedShip = getOpponent(p).getMap().findShipAt(position);
-        }
+        selectedShip = getSelectedShip(player, position);
         if (selectedShip == null) {
-            if (p != activePlayer) {
-                send(p, EffectMessage.miss(false, position));
-            } else {
-                send(activePlayer, EffectMessage.miss(true, position));
+            shotMissed(player, position);
+        }
+        else {
+            shotHit(player, position, selectedShip);
+        }
+    }
+
+    /**
+     * Returns the ship at a given position
+     * @param player the player whose map will be checked for a ship
+     * @param position the position to be checked for a ship
+     * @return if there is a ship at the given position, returns the ship, else null
+     */
+    Battleship getSelectedShip(Player player, IntPoint position) {
+        if (player != activePlayer) {
+            return player.getMap().findShipAt(position);
+        }
+        else {
+            return getOpponent(player).getMap().findShipAt(position);
+        }
+    }
+
+    /**
+     * Sends a message to the client that the shot missed
+     * @param player the player receiving the message
+     * @param position the position at which the shot hit in the water
+     */
+    void shotMissed(Player player, IntPoint position) {
+        if (player != activePlayer) {
+            send(player, EffectMessage.miss(false, position));
+        }
+        else
+            send(activePlayer, EffectMessage.miss(true, position));
+
+        if (p1AnimationFinished && p2AnimationFinished)
+            if (player == activePlayer)
+                activePlayer = getOpponent(player);
+            else
+                activePlayer = player;
+    }
+
+    /**
+     * Sends a message to the client that the shot missed
+     * @param player the player receiving the message
+     * @param position the position at which the shot hit in the ship
+     * @param ship the ship that has been hit
+     */
+    void shotHit(Player player, IntPoint position, Battleship ship) {
+        ship.hit(position);
+        if (getOpponent(activePlayer).getMap().getRemainingShips().isEmpty()) {
+            if (player != activePlayer)
+                send(player, EffectMessage.lost(position, ship, activePlayer.getMap().getRemainingShips()));
+            else
+                send(activePlayer, EffectMessage.won(position, ship));
+
+            if (p1AnimationFinished && p2AnimationFinished) {
+                setState(ServerState.GAME_OVER);
             }
-            if(player1AnimationReady && player2AnimationReady){
-                LOGGER.log(Level.DEBUG, "switched active player");
-                if(p != activePlayer){
-                    activePlayer = p;
-                } else {
-                    activePlayer = getOpponent(p);
-                }
+        }
+        else if (ship.isDestroyed()) {
+            if (player != activePlayer)
+                send(player, EffectMessage.shipDestroyed(false, position, ship));
+            else
+                send(activePlayer, EffectMessage.shipDestroyed(true, position, ship));
+        }
+        else {
+            if (player != activePlayer) {
+                send(player, EffectMessage.hit(false, position));
             }
-        } else {
-            selectedShip.hit(position);
-            if(getOpponent(activePlayer).getMap().getRemainingShips().isEmpty()){
-                if(p != activePlayer){
-                    send(p, EffectMessage.lost(position, selectedShip, activePlayer.getMap().getRemainingShips()));
-                } else {
-                    send(activePlayer, EffectMessage.won(position, selectedShip));
-                }
-                if(player1AnimationReady && player2AnimationReady){
-                    setState(ServerState.GAME_OVER);
-                }
-            } else if (selectedShip.isDestroyed()){
-                if(p != activePlayer){
-                    send(p, EffectMessage.shipDestroyed(false, position, selectedShip));
-                } else {
-                    send(activePlayer, EffectMessage.shipDestroyed(true, position, selectedShip));
-                }
-            } else {
-                if(p != activePlayer){
-                    send(p, EffectMessage.hit(false, position));
-                } else {
-                    send(activePlayer, EffectMessage.hit(true, position));
-                }
+            else {
+                send(activePlayer, EffectMessage.hit(true, position));
             }
         }
     }
-}
+}

Projekte/battleship/model/src/main/java/pp/battleship/game/server/ServerSender.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.game.server;
 
 import pp.battleship.message.server.ServerMessage;

Projekte/battleship/model/src/main/java/pp/battleship/game/server/ServerState.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.server;
 
@@ -27,12 +22,12 @@ enum ServerState {
     BATTLE,
 
     /**
-     * The game has ended because all the ships of one player have been destroyed.
+     * Waits for the Animation to finish
      */
-    GAME_OVER,
+    WAIT_ANIMATION,
 
     /**
-     * The server waits for all players to finish the animation
+     * The game has ended because all the ships of one player have been destroyed.
      */
-    ANIMATION_WAIT
+    GAME_OVER
 }

Projekte/battleship/model/src/main/java/pp/battleship/game/singlemode/BattleshipClientConfig.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.game.singlemode;
 
 import pp.battleship.BattleshipConfig;

Projekte/battleship/model/src/main/java/pp/battleship/game/singlemode/Copycat.java

@@ -1,13 +1,12 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.singlemode;
 
-import pp.battleship.message.client.*;
+import pp.battleship.message.client.ClientInterpreter;
+import pp.battleship.message.client.ClientMessage;
+import pp.battleship.message.client.EndAnimationMessage;
+import pp.battleship.message.client.MapMessage;
+import pp.battleship.message.client.ShootMessage;
 import pp.battleship.model.Battleship;
 
 /**
@@ -61,15 +60,13 @@ public void received(MapMessage msg, int from) {
     }
 
     /**
-     * Handles the reception of a AnimationEndMessage
-     * Creates a copy of the AnimationEndMessage
-     *
-     * @param msg the AnimationEndMessage to be processed
-     * @param from the connection ID from which the message was received
+     * Creates a copy of the provided EndAnimation message
+     * @param msg thr received EndAnimation message
+     * @param from the identifier of the sender
      */
     @Override
-    public void received(AnimationEndMessage msg, int from) {
-        copiedMessage = new AnimationEndMessage(msg.getPosition());
+    public void received(EndAnimationMessage msg, int from) {
+        copiedMessage = new EndAnimationMessage(msg.getPosition());
     }
 
     /**

Projekte/battleship/model/src/main/java/pp/battleship/game/singlemode/InterpreterProxy.java

@@ -1,10 +1,3 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.battleship.game.singlemode;
 
 import pp.battleship.game.client.BattleshipClient;
@@ -21,6 +14,7 @@ class InterpreterProxy implements ServerInterpreter {
     private final BattleshipClient playerClient;
 
     static final System.Logger LOGGER = System.getLogger(InterpreterProxy.class.getName());
+
     /**
      * Constructs an InterpreterProxy with the specified BattleshipClient.
      *
@@ -86,7 +80,7 @@ public void received(EffectMessage msg) {
      * @param msg the AnimationStartMessage received from the server
      */
     @Override
-    public void received(AnimationStartMessage msg) {
+    public void received(StartAnimationMessage msg) {
         forward(msg);
     }
 
@@ -96,7 +90,7 @@ public void received(AnimationStartMessage msg) {
      * @param msg the SwitchBattleState received from the server
      */
     @Override
-    public void received(SwitchBattleState msg){
+    public void received(SwitchToBattleState msg) {
         LOGGER.log(System.Logger.Level.INFO, "Received SwitchBattleState");
         forward(msg);
     }

Projekte/battleship/model/src/main/java/pp/battleship/game/singlemode/RobotClient.java

@@ -1,7 +1,7 @@
 package pp.battleship.game.singlemode;
 
 import pp.battleship.game.client.BattleshipClient;
-import pp.battleship.message.client.AnimationEndMessage;
+import pp.battleship.message.client.EndAnimationMessage;
 import pp.battleship.message.client.MapMessage;
 import pp.battleship.message.client.ShootMessage;
 import pp.battleship.message.server.*;
@@ -126,9 +126,9 @@ public void received(EffectMessage msg) {
      * @param msg the AnimationStartMessage received
      */
     @Override
-    public void received(AnimationStartMessage msg) {
+    public void received(StartAnimationMessage msg) {
         LOGGER.log(Level.INFO, "Received AnimationStartMessage: {0}", msg);
-        connection.sendRobotMessage(new AnimationEndMessage(msg.getPosition()));
+        connection.sendRobotMessage(new EndAnimationMessage(msg.getPosition()));
     }
 
     /**
@@ -137,9 +137,9 @@ public void received(AnimationStartMessage msg) {
      * @param msg the SwitchBattleState received
      */
     @Override
-    public void received(SwitchBattleState msg){
+    public void received(SwitchToBattleState msg) {
         LOGGER.log(Level.INFO, "Received SwitchBattleStateMessage: {0}", msg);
-        if (msg.isTurn())
+        if (msg.getTurn())
             shoot();
     }
-}
+}

Projekte/battleship/model/src/main/java/pp/battleship/game/singlemode/ServerConnectionMockup.java

@@ -1,9 +1,4 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
+
 
 package pp.battleship.game.singlemode;