diff options
-rw-r--r-- | src/esieequest/Command.java | 2 | ||||
-rw-r--r-- | src/esieequest/Game.java | 8 | ||||
-rw-r--r-- | src/esieequest/Room.java | 13 |
3 files changed, 7 insertions, 16 deletions
diff --git a/src/esieequest/Command.java b/src/esieequest/Command.java index f6afdea..de6b853 100644 --- a/src/esieequest/Command.java +++ b/src/esieequest/Command.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package esieequest; | 1 | package esieequest; |
2 | 2 | ||
3 | /** | 3 | /** |
4 | * Représente une commande tapée au clavier qui provoque une action dans le jeu. | 4 | * A text command that triggers an action in the game. |
5 | * | 5 | * |
6 | * @author Pacien TRAN-GIRARD | 6 | * @author Pacien TRAN-GIRARD |
7 | * @author Benoit LUBRANO DI SBARAGLIONE | 7 | * @author Benoit LUBRANO DI SBARAGLIONE |
diff --git a/src/esieequest/Game.java b/src/esieequest/Game.java index 147efc5..59ec017 100644 --- a/src/esieequest/Game.java +++ b/src/esieequest/Game.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package esieequest; | 1 | package esieequest; |
2 | 2 | ||
3 | /** | 3 | /** |
4 | * Moteur du jeu. | 4 | * The game engine. |
5 | * | 5 | * |
6 | * @author Pacien TRAN-GIRARD | 6 | * @author Pacien TRAN-GIRARD |
7 | * @author Benoit LUBRANO DI SBARAGLIONE | 7 | * @author Benoit LUBRANO DI SBARAGLIONE |
@@ -31,7 +31,7 @@ public class Game { | |||
31 | } | 31 | } |
32 | 32 | ||
33 | private void createRooms() { | 33 | private void createRooms() { |
34 | // cr�ation des lieux | 34 | // create rooms |
35 | Room vAmphitheaterSeat = new Room("in the amphitheater"); | 35 | Room vAmphitheaterSeat = new Room("in the amphitheater"); |
36 | Room vAmphitheaterStage = new Room("on the amphitheater stage"); | 36 | Room vAmphitheaterStage = new Room("on the amphitheater stage"); |
37 | Room vAmphitheaterEntrance = new Room("at the amphitheater entrance"); | 37 | Room vAmphitheaterEntrance = new Room("at the amphitheater entrance"); |
@@ -56,7 +56,7 @@ public class Game { | |||
56 | Room vCorridorTwoOffice = new Room("in front of the office at floor 2"); | 56 | Room vCorridorTwoOffice = new Room("in front of the office at floor 2"); |
57 | Room vOffice = new Room("in the office number 3254"); | 57 | Room vOffice = new Room("in the office number 3254"); |
58 | 58 | ||
59 | // positionnement des sorties (N,S,E,W) | 59 | // connect rooms (N, S, E, W) |
60 | vAmphitheaterSeat.setExits(vAmphitheaterFront, vAmphitheaterFront, null, null); | 60 | vAmphitheaterSeat.setExits(vAmphitheaterFront, vAmphitheaterFront, null, null); |
61 | vAmphitheaterStage.setExits(null, null, vAmphitheaterEntrance, vCafeteria); | 61 | vAmphitheaterStage.setExits(null, null, vAmphitheaterEntrance, vCafeteria); |
62 | vAmphitheaterEntrance.setExits(vAmphitheaterFront, null, null, vAmphitheaterStage); | 62 | vAmphitheaterEntrance.setExits(vAmphitheaterFront, null, null, vAmphitheaterStage); |
@@ -81,7 +81,7 @@ public class Game { | |||
81 | vCorridorTwoOffice.setExits(null, vCorridorTwo, vOffice, null); | 81 | vCorridorTwoOffice.setExits(null, vCorridorTwo, vOffice, null); |
82 | vOffice.setExits(null, null, null, vCorridorTwoOffice); | 82 | vOffice.setExits(null, null, null, vCorridorTwoOffice); |
83 | 83 | ||
84 | // initialisation du lieu courant | 84 | // set the starting room |
85 | this.aCurrentRoom = vAmphitheaterSeat; | 85 | this.aCurrentRoom = vAmphitheaterSeat; |
86 | } | 86 | } |
87 | 87 | ||
diff --git a/src/esieequest/Room.java b/src/esieequest/Room.java index a8db140..b7a3339 100644 --- a/src/esieequest/Room.java +++ b/src/esieequest/Room.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package esieequest; | 1 | package esieequest; |
2 | 2 | ||
3 | /** | 3 | /** |
4 | * Un lieu. | 4 | * A room. |
5 | * | 5 | * |
6 | * @author Pacien TRAN-GIRARD | 6 | * @author Pacien TRAN-GIRARD |
7 | * @author Benoit LUBRANO DI SBARAGLIONE | 7 | * @author Benoit LUBRANO DI SBARAGLIONE |
@@ -25,16 +25,7 @@ public class Room { | |||
25 | } | 25 | } |
26 | 26 | ||
27 | /** | 27 | /** |
28 | * Défini les quatre sorties (lieux) du lieu | 28 | * Defines the four exits (other rooms) of this room. |
29 | * | ||
30 | * @param pNorthExit | ||
31 | * lieu au Nord | ||
32 | * @param pSouthExit | ||
33 | * lieu au Sud | ||
34 | * @param pEastExit | ||
35 | * lieu à l'Est | ||
36 | * @param pWestExit | ||
37 | * lieu à l'Ouest | ||
38 | */ | 29 | */ |
39 | public void setExits(final Room pNorthExit, final Room pSouthExit, final Room pEastExit, final Room pWestExit) { | 30 | public void setExits(final Room pNorthExit, final Room pSouthExit, final Room pEastExit, final Room pWestExit) { |
40 | this.aNorthExit = pNorthExit; | 31 | this.aNorthExit = pNorthExit; |