Merge branch 'master' of https://gitlab.pacien.net/pacien/a3p-esieequest

17 files changed, 52 insertions, 8 deletions

diff --git a/res/resources/audio/END.ogg b/res/resources/audio/END.ogg
index db2b370..da9b823 100644
--- a/res/resources/audio/END.ogg
+++ b/res/resources/audio/END.ogg
diff --git a/res/resources/audio/FEED_ATHANASE.ogg b/res/resources/audio/FEED_ATHANASE.ogg
index 94e8668..e771484 100644
--- a/res/resources/audio/FEED_ATHANASE.ogg
+++ b/res/resources/audio/FEED_ATHANASE.ogg
diff --git a/res/resources/audio/FIND_CONSOLE.ogg b/res/resources/audio/FIND_CONSOLE.ogg
index 39aee7e..df7b169 100644
--- a/res/resources/audio/FIND_CONSOLE.ogg
+++ b/res/resources/audio/FIND_CONSOLE.ogg
diff --git a/res/resources/audio/FIND_DISK.ogg b/res/resources/audio/FIND_DISK.ogg
index b852de2..73e13f1 100644
--- a/res/resources/audio/FIND_DISK.ogg
+++ b/res/resources/audio/FIND_DISK.ogg
diff --git a/res/resources/audio/GAME_LOST.ogg b/res/resources/audio/GAME_LOST.ogg
index 71dffae..e7ea01d 100644
--- a/res/resources/audio/GAME_LOST.ogg
+++ b/res/resources/audio/GAME_LOST.ogg
diff --git a/res/resources/audio/INSTALL_CONSOLE.ogg b/res/resources/audio/INSTALL_CONSOLE.ogg
index fe7a296..4e9bdab 100644
--- a/res/resources/audio/INSTALL_CONSOLE.ogg
+++ b/res/resources/audio/INSTALL_CONSOLE.ogg
diff --git a/res/resources/audio/INTRO.ogg b/res/resources/audio/INTRO.ogg
index da90187..6281bdd 100644
--- a/res/resources/audio/INTRO.ogg
+++ b/res/resources/audio/INTRO.ogg
diff --git a/res/resources/audio/USE_DISK.ogg b/res/resources/audio/USE_DISK.ogg
new file mode 100644
index 0000000..93ca1b5
--- /dev/null
+++ b/res/resources/audio/USE_DISK.ogg
diff --git a/res/resources/audio/WHAT_HAPPENED.ogg b/res/resources/audio/WHAT_HAPPENED.ogg
index 0aac689..e149474 100644
--- a/res/resources/audio/WHAT_HAPPENED.ogg
+++ b/res/resources/audio/WHAT_HAPPENED.ogg
diff --git a/src/esieequest/engine/GameEngine.java b/src/esieequest/engine/GameEngine.java
index 9211eb0..ebd37b4 100644
--- a/src/esieequest/engine/GameEngine.java
+++ b/src/esieequest/engine/GameEngine.java
@@ -111,7 +111,7 @@ public class GameEngine {
                                         return;
                                 }
                         });
-                        this.view.echo("You are trapped. You losed.");
+                        this.view.echo("You are trapped. Game Over.");
                 }
 
         }
diff --git a/src/esieequest/engine/commands/Command.java b/src/esieequest/engine/commands/Command.java
index 5c44e9b..e73856a 100644
--- a/src/esieequest/engine/commands/Command.java
+++ b/src/esieequest/engine/commands/Command.java
@@ -43,6 +43,7 @@ public enum Command {
         
         // shortcuts
         DO(new DoCommand()),
+        KILL(new KillCommand()),
         
         ;
 
diff --git a/src/esieequest/engine/commands/KillCommand.java b/src/esieequest/engine/commands/KillCommand.java
new file mode 100644
index 0000000..9f5dc49
--- /dev/null
+++ b/src/esieequest/engine/commands/KillCommand.java
@@ -0,0 +1,28 @@
+package esieequest.engine.commands;
+
+import esieequest.game.Game;
+import esieequest.game.Text;
+import esieequest.ui.View;
+
+/**
+ * Allows the user to commit suicide.
+ * 
+ * @author Benoit LUBRANO DI SBARAGLIONE
+ */
+public class KillCommand implements Executable {
+        
+        @Override
+        public void execute(final String argument, final Game game, final View view) {
+
+                if (!argument.isEmpty()) {
+                        view.echo(Text.TOO_MANY_ARGUMENTS.toString());
+                        return;
+                }
+
+                view.echo(Text.KILL.toString());
+                view.disableInput();
+                view.stopMusic();
+
+        }
+
+}
diff --git a/src/esieequest/game/Text.java b/src/esieequest/game/Text.java
index 7f74e58..09317c1 100644
--- a/src/esieequest/game/Text.java
+++ b/src/esieequest/game/Text.java
@@ -55,6 +55,7 @@ public enum Text {
         WELCOME("Welcome to ESIEEquest! ESIEEquest is a new, amazingly boring adventure game."),
         CHALLENGE_FAILED("Challenge failed: you died from exhaustion..."),
         QUIT("Thanks for wasting your time. Good bye."),
+        KILL("You killed yourself! Game Over."),
         
         ALEA_OVERRIDE_ENABLED("Alea override enabled."),
         ALEA_OVERRIDE_DISABLED("Alea override disabled."),
diff --git a/src/esieequest/game/characters/Athanase.java b/src/esieequest/game/characters/Athanase.java
index 51fa3c0..442273f 100644
--- a/src/esieequest/game/characters/Athanase.java
+++ b/src/esieequest/game/characters/Athanase.java
@@ -10,6 +10,7 @@ import esieequest.ui.View;
  * Athanase the mathgorilla.
  * 
  * @author Pacien TRAN-GIRARD
+ * @author Benoit LUBRANO DI SBARAGLIONE
  */
 public class Athanase extends SimpleCharacter {
 
@@ -36,7 +37,7 @@ public class Athanase extends SimpleCharacter {
                         if (playersInventory.hasItem(Item.BANANA)) {
                                 playersInventory.removeItem(Item.BANANA);
                                 view.updateInventory(playersInventory);
-                                view.echo("Ooooh! You have a banana! *nomz* WAIT!... It tastes like... an EMERGENCY BANANA! That means... Hmmm..."
+                                view.echo("Ooooh! You have a banana! *nomz* WAIT!... It tastes like... an EMERGENCY BANANA! That means... Hmmm..." 
                                                 + "\n"
                                                 + "They turned it ON... Their stupid machine... It was not ready. It was a beta... Obviously it crashed... WITH THE ENTIRE UNIVERSE"
                                                 + "\n" + "I think we have to restart everything...");
@@ -71,12 +72,15 @@ public class Athanase extends SimpleCharacter {
                         if (playersInventory.hasItem(Item.PORTABLE_CONSOLE)) {
                                 view.echo("The Universe is far away... Well... Not exactly... Sort of... Complicated. Find an antenna on the outside or something that may act as an amplifier and connect the Portable Console to contact the Universe.");
                         } else {
+                                view.echo("You should go outside, at the Console instead of talking to me.");
+                        }
+                        break;
+                case USE_DISK:
+                        if (playersInventory.hasItem(Item.DISK)) {
                                 view.echo("Well... You have installed the console, right? Have you turned it ON and inserted the disk? Because you should.");
                         }
                         break;
-
                 }
 
         }
-
 }
diff --git a/src/esieequest/game/items/Banana.java b/src/esieequest/game/items/Banana.java
index 81f0b45..0c7e7ba 100644
--- a/src/esieequest/game/items/Banana.java
+++ b/src/esieequest/game/items/Banana.java
@@ -1,12 +1,14 @@
 package esieequest.game.items;
 
 import esieequest.game.Game;
+import esieequest.game.states.Quest;
 import esieequest.ui.View;
 
 /**
  * A Banana that can be eaten only by Athanase.
  * 
  * @author Pacien TRAN-GIRARD
+ * @author Benoit LUBRANO DI SBARAGLIONE
  */
 public class Banana extends SimpleItem {
 
@@ -19,7 +21,10 @@ public class Banana extends SimpleItem {
 
         @Override
         public void use(final Game game, final View view) {
-                view.echo("Better keep it for later...");
+                if (game.getPlayer().getCurrentQuest() == Quest.FEED_ATHANASE) {
+                        view.echo("Athanase would eat this!");
+                } else {
+                        view.echo("Better keep it for later...");
+                }
         }
-
 }
diff --git a/src/esieequest/game/items/PortableConsole.java b/src/esieequest/game/items/PortableConsole.java
index 9c14219..cf63da1 100644
--- a/src/esieequest/game/items/PortableConsole.java
+++ b/src/esieequest/game/items/PortableConsole.java
@@ -3,12 +3,14 @@ package esieequest.game.items;
 import esieequest.game.Game;
 import esieequest.game.map.Direction;
 import esieequest.game.map.Room;
+import esieequest.game.states.Quest;
 import esieequest.ui.View;
 
 /**
  * The transponder.
  * 
  * @author Pacien TRAN-GIRARD
+ * @author Benoit LUBRANO DI SBARAGLIONE
  */
 public class PortableConsole extends SimpleItem {
 
@@ -23,11 +25,13 @@ public class PortableConsole extends SimpleItem {
         public void use(final Game game, final View view) {