Merge branch 'zuul-extended' into 'master'

Zuul Extended

1 files changed, 49 insertions, 5 deletions

diff --git a/report/progression.tex b/report/progression.tex
index ccfff83..1a74d8d 100644
--- a/report/progression.tex
+++ b/report/progression.tex
@@ -55,8 +55,11 @@ the room since commit e510b08d0.
 
 \subsection{Object diagram}
 
+%TODO
+
 \subsubsection{Changes on execution}
 
+%TODO
 
 \section{Zuul with features}
 
@@ -327,32 +330,64 @@ with the commit number 159b168b2.
 
 \subsection{Time limit}
 
-\subsubsection{Real time}
+The time limit was implemented as a steps limit for the player. When this limit 
+is reached, the game quits with a message. The argument --challenge is necessary
+to enable this game mode. Commit number 2fee72805.
 
 \subsection{GUI}
 
+The actuel GUI will be improved at the end of the project, when all new
+functionnalities will be implemented.
+
 \subsection{Trap door}
 
+A TrapDoor was added to link the main map to the off-script map, and all Rooms
+are linked through Doors since the commit number 6e388ec78. When crossing a
+TrapDoor, the Performer clears the Player's previous Rooms Stack.
+
 \subsection{Beamer}
 
+A Beamer was added with the commit number 6a154d2fe. It can be used once picked
+up via the ``use'' command. It alternatively memorises the player's current room
+and teleports him back.
+
 \subsection{Locked door}
 
+A locked door was implement with the commit number e9c61548b. To pass through,
+the player needs to pick up a corresponding key.
+
 \subsection{Tests}
 
+The test files were updated to fit the last modifications.
+
 \subsection{Transporter room}
 
+The transporter was implemented as a sub-type of Door instead of Room, since the
+Player has to be transported when he crosses the Door. This is part of the
+commit number c5a766345.
+
 \subsubsection{alea}
 
+c99590be11 - An alea overriding command for the random TransporterDoor was
+implemented. It is now possible to force the destination room with this command.
+
+\subsection{Character}
+
+3e7f68425 - Characters that can talk were added.
+
+\subsubsection{Moving character}
+
+Moving characters that can move to adjacent rooms once permitted were added.
+
+
+\section{Zuul even better}
+
 \subsection{Inheritance}
 
 \subsection{Abstract Command}
 
 \subsection{Packages}
 
-\subsection{Character}
-
-\subsubsection{Moving character}
-
 
 \section{Zuul without BlueJ}
 
@@ -365,6 +400,15 @@ with the commit number 159b168b2.
 
 \section{Zuul awesome}
 
+\subsection{Non-droppable items}
+
+Non-droppable items were added with the commit number ef51d5137.
+
+\subsection{Hidden doors}
+
+Hidden Doors that are not shown as exits were added with the commit number
+20c9b8b28.
+
 \subsection{Room sides}
 
 \subsection{Quests}