Merge branch 'zuul-with-items' into 'master'

Zuul With Items

1 files changed, 28 insertions, 0 deletions

diff --git a/report/progression.tex b/report/progression.tex
index 24c5d7a..94cc5b5 100644
--- a/report/progression.tex
+++ b/report/progression.tex
@@ -266,20 +266,48 @@ to win the game.
 
 \subsection{Player}
 
+The current room and the previous rooms were moved from Game to Player with
+commit 92f671b84.
+
 \subsection{take, drop}
 
+The take and drop commands were implemented as part of the commit number
+5ddb6df63. An Inventory interface, used by the Room and Player classes, was
+added. Items are stored using HashMaps, and a moveItem procedure was added to
+the Performer.
+
 \subsection{Carry several items}
 
+Multiple items carrying was already implemented in the commit number 5ddb6df63.
+
 \subsection{ItemList}
 
+The ItemList was implemented as the Inventory class in commit number db2c22c9b.
+The Inventory is no longer an interface.
+
 \subsection{Maximum weight}
 
+The maximum carryable weight was implement with the commit number b8771ccb2.
+In order to achieve this, a getTotalWeight() function was added to the Inventory
+class.
+
 \subsection{Inventory}
 
+The player's inventory items listing was implemented with the commit number
+a3f6ce16e, using the recently added listing utility class.
+
 \subsection{Magic cookie}
 
+Since there are already too many commands, the carryable weight
+expansion was implemented in a smarter way using a negative weight
+item in the commit number 35ee3b1ee.
+We could have instead increased the maximum carryable weight with a setter on
+the Player class, called by the Performer with the ``eat'' command.
+
 \subsection{Tests}
 
+The commands test file was updated in the commit number 7b610fc05.
+
 
 \section{Zuul with enums}