Merge remote-tracking branch 'origin/main'

heig-vkaelin · Jun 19, 2022 · f6099b8 · f6099b8
2 parents d2aabf5 + 19f557e
commit f6099b8
Show file tree

Hide file tree

Showing 26 changed files with 1,024 additions and 2,575 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,10 @@
 
 # Dodo is stuck in traffic
 
+Remake du jeu d’énigme bien connu **Rush Hour** en Java avec la librairie Swing.
+
+![Example](docs/examples/playView.png)
+
 ## Auteurs
 - Maxime Scharwath
 - Nicolas Crausaz

diff --git a/docs/DiagrammePrésentation.sly b/docs/DiagrammePrésentation.sly
diff --git a/docs/diagramme.png b/docs/diagramme.png
diff --git a/docs/examples/mainView.png b/docs/examples/mainView.png
diff --git a/docs/examples/menuView.png b/docs/examples/menuView.png
diff --git a/docs/examples/playView.png b/docs/examples/playView.png
diff --git a/docs/examples/playViewWin.png b/docs/examples/playViewWin.png
diff --git a/docs/v2.sly b/docs/v2.sly
diff --git a/src/main/java/ch/heigvd/mcr/assets/AssetManager.java b/src/main/java/ch/heigvd/mcr/assets/AssetManager.java
@@ -16,6 +16,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class AssetManager<A> {
     private static final List<AssetManager<?>> ASSET_MANAGERS = new LinkedList<>();

diff --git a/src/main/java/ch/heigvd/mcr/assets/Audio.java b/src/main/java/ch/heigvd/mcr/assets/Audio.java
@@ -15,6 +15,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class Audio {
     private final Clip clip;

diff --git a/src/main/java/ch/heigvd/mcr/assets/AudioManager.java b/src/main/java/ch/heigvd/mcr/assets/AudioManager.java
@@ -10,6 +10,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class AudioManager {
     private static AudioManager instance;

diff --git a/src/main/java/ch/heigvd/mcr/assets/SpriteSheet.java b/src/main/java/ch/heigvd/mcr/assets/SpriteSheet.java
@@ -8,7 +8,6 @@
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.file.Path;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -20,6 +19,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class SpriteSheet {
     private final Map<String, Image> sprites = new HashMap<>();

diff --git a/src/main/java/ch/heigvd/mcr/assets/loaders/AssetLoader.java b/src/main/java/ch/heigvd/mcr/assets/loaders/AssetLoader.java
@@ -12,6 +12,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public abstract class AssetLoader<T> {
     private final URL url;

diff --git a/src/main/java/ch/heigvd/mcr/assets/loaders/AudioAssetLoader.java b/src/main/java/ch/heigvd/mcr/assets/loaders/AudioAssetLoader.java
@@ -13,6 +13,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class AudioAssetLoader extends AssetLoader<Audio> {
     /**

diff --git a/src/main/java/ch/heigvd/mcr/assets/loaders/ImageAssetLoader.java b/src/main/java/ch/heigvd/mcr/assets/loaders/ImageAssetLoader.java
@@ -14,6 +14,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class ImageAssetLoader extends AssetLoader<Image> {
     /**

diff --git a/src/main/java/ch/heigvd/mcr/assets/loaders/LevelAssetLoader.java b/src/main/java/ch/heigvd/mcr/assets/loaders/LevelAssetLoader.java
@@ -14,6 +14,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class LevelAssetLoader extends AssetLoader<LevelState> {
     /**

diff --git a/src/main/java/ch/heigvd/mcr/assets/loaders/SpriteSheetAssetLoader.java b/src/main/java/ch/heigvd/mcr/assets/loaders/SpriteSheetAssetLoader.java
@@ -13,6 +13,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class SpriteSheetAssetLoader extends AssetLoader<SpriteSheet> {
     /**

diff --git a/src/main/java/ch/heigvd/mcr/assets/registers/LevelsRegister.java b/src/main/java/ch/heigvd/mcr/assets/registers/LevelsRegister.java
@@ -18,6 +18,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class LevelsRegister implements Register<LevelState> {
     @Override

diff --git a/src/main/java/ch/heigvd/mcr/assets/registers/Register.java b/src/main/java/ch/heigvd/mcr/assets/registers/Register.java
@@ -11,6 +11,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public interface Register<A> {
     /**

diff --git a/src/main/java/ch/heigvd/mcr/commands/CheatCommand.java b/src/main/java/ch/heigvd/mcr/commands/CheatCommand.java
@@ -6,6 +6,17 @@
 
 import java.util.*;
 
+/**
+ * Commande permettant de tricher en supprimant une entité aléatoirement
+ * (ne peut pas supprimer la voiture du joueur)
+ *
+ * @author Jonathan Friedli
+ * @author Lazar Pavicevic
+ * @author Maxime Scharwath
+ * @author Nicolas Crausaz
+ * @author Valentin Kaelin
+ * @version 2022-06-19
+ */
 public class CheatCommand implements Command {
     private static final Random rand = new Random();
     private Entity deletedEntity;
@@ -24,7 +35,7 @@ public void execute() {
             if (i == j) {
                 if (!array[i].isThePlayer()) {
                     deletedEntity = array[i];
-                } else  {
+                } else {
                     deletedEntity = array[i + 1];
                 }
             }

diff --git a/src/main/java/ch/heigvd/mcr/commands/Command.java b/src/main/java/ch/heigvd/mcr/commands/Command.java
@@ -8,6 +8,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public interface Command {
     /**

diff --git a/src/main/java/ch/heigvd/mcr/commands/LoadLevelCommand.java b/src/main/java/ch/heigvd/mcr/commands/LoadLevelCommand.java
@@ -13,6 +13,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class LoadLevelCommand implements Command {
     private final int levelId;

diff --git a/src/main/java/ch/heigvd/mcr/commands/MacroCommand.java b/src/main/java/ch/heigvd/mcr/commands/MacroCommand.java
@@ -11,6 +11,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class MacroCommand implements Command {
     private final List<Command> subCommands;

diff --git a/src/main/java/ch/heigvd/mcr/commands/MoveCommand.java b/src/main/java/ch/heigvd/mcr/commands/MoveCommand.java
@@ -12,6 +12,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class MoveCommand implements Command {
     private final Entity entity;

diff --git a/src/main/java/ch/heigvd/mcr/commands/TurnCommand.java b/src/main/java/ch/heigvd/mcr/commands/TurnCommand.java
@@ -10,6 +10,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class TurnCommand extends MacroCommand {
     @Override

diff --git a/src/main/java/ch/heigvd/mcr/commands/UndoCommand.java b/src/main/java/ch/heigvd/mcr/commands/UndoCommand.java
@@ -10,6 +10,7 @@
  * @author Maxime Scharwath
  * @author Nicolas Crausaz
  * @author Valentin Kaelin
+ * @version 2022-06-19
  */
 public class UndoCommand implements Command {
     @Override