diff options
author | Pacien TRAN-GIRARD | 2014-04-06 15:17:34 +0200 |
---|---|---|
committer | Pacien TRAN-GIRARD | 2014-04-06 15:17:34 +0200 |
commit | 35ee3b1ee2d9d77f605f06e8adb5b69708463ba3 (patch) | |
tree | 296da1572769e1a27cf34c2972c63af34727684d /src | |
parent | ed9e5e3bc1f8861b9c235d3c486cbf750f8f37d2 (diff) | |
download | esieequest-35ee3b1ee2d9d77f605f06e8adb5b69708463ba3.tar.gz |
Implement carryable weight increasing via negative mass item
Diffstat (limited to 'src')
-rw-r--r-- | src/esieequest/controller/Interpreter.java | 3 | ||||
-rw-r--r-- | src/esieequest/controller/Performer.java | 7 | ||||
-rw-r--r-- | src/esieequest/model/Game.java | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/esieequest/controller/Interpreter.java b/src/esieequest/controller/Interpreter.java index ea01fd7..5c60f6d 100644 --- a/src/esieequest/controller/Interpreter.java +++ b/src/esieequest/controller/Interpreter.java | |||
@@ -69,9 +69,6 @@ class Interpreter { | |||
69 | case "look": | 69 | case "look": |
70 | this.performer.look(); | 70 | this.performer.look(); |
71 | return; | 71 | return; |
72 | case "eat": | ||
73 | this.performer.eat(); | ||
74 | return; | ||
75 | case "inventory": | 72 | case "inventory": |
76 | this.performer.listItems(); | 73 | this.performer.listItems(); |
77 | return; | 74 | return; |
diff --git a/src/esieequest/controller/Performer.java b/src/esieequest/controller/Performer.java index 7f41109..8f8afeb 100644 --- a/src/esieequest/controller/Performer.java +++ b/src/esieequest/controller/Performer.java | |||
@@ -125,13 +125,6 @@ class Performer { | |||
125 | } | 125 | } |
126 | 126 | ||
127 | /** | 127 | /** |
128 | * Displays a special message. | ||
129 | */ | ||
130 | public void eat() { | ||
131 | this.echo(this.game.getEatMessage()); | ||
132 | } | ||
133 | |||
134 | /** | ||
135 | * Moves an item from the current Room to the Player's inventory. | 128 | * Moves an item from the current Room to the Player's inventory. |
136 | * | 129 | * |
137 | * @param itemName | 130 | * @param itemName |
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java index f08f264..cc6157d 100644 --- a/src/esieequest/model/Game.java +++ b/src/esieequest/model/Game.java | |||
@@ -193,6 +193,7 @@ public class Game { | |||
193 | private void createItems() { | 193 | private void createItems() { |
194 | this.rooms.get("Cafeteria").getItems().putItem("banana", new Item("A yellow banana", 5)); | 194 | this.rooms.get("Cafeteria").getItems().putItem("banana", new Item("A yellow banana", 5)); |
195 | this.rooms.get("Cafeteria").getItems().putItem("orange", new Item("An orange orange", 6)); | 195 | this.rooms.get("Cafeteria").getItems().putItem("orange", new Item("An orange orange", 6)); |
196 | this.rooms.get("Cafeteria").getItems().putItem("anti-matter", new Item("A block of anti-matter with a negative mass", -10)); | ||
196 | } | 197 | } |
197 | 198 | ||
198 | /** | 199 | /** |