Merge origin/master

src/java/Game.java

@@ -158,6 +158,29 @@ public class Game {
                     say("das kann nicht geöffnet werden");
                 }
                 break;
+            //intent
+            case "resetintent":
+            {
+                if (itemName == null && puzzleName == null) {
+                    say("Das Spiel wird nun neu gestartet");
+                    resetGame();
+                }
+                    }
+            //intent
+            case "skipintent":
+            {
+                if (itemName == null && puzzleName == null) {
+                    resetGame();
+                    for(int i = 0; i < currentRoom.puzzles.size(); i++)
+                    {
+                        if(currentRoom.puzzles.get(i).getNextRoom() != null)
+                        {
+                            setRoom(currentRoom.puzzles.get(i).getNextRoom());
+                            say(currentRoom.puzzles.get(i).getNextRoom().getDescription());
+                        }
+                    }
+                }
+            }
         }
         itemName = null;
         intentName = null;
@@ -178,6 +201,11 @@ public class Game {
         }
     }
     
+    public void resetGame(){
+        
+        startGame();
+    }
+
     public void inspect(String s) {
         Item currentItem = currentRoom.getItem(s);
         Puzzle currentPuzzle = currentRoom.getPuzzle(s);

src/java/Item.java

@@ -1,7 +1,6 @@
 
 public class Item
 {
-	private int id;
 	private String name;
 	private boolean portableFlag;
 	private boolean hiddenFlag;
@@ -21,14 +20,6 @@ public class Item
 		this.description = description;
 	}
 
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
 	public String getName() {
 		return name;
 	}

src/java/Puzzle.java

@@ -2,7 +2,6 @@ import java.util.ArrayList;
 
 public class Puzzle
 {
-	private int id;
 	private String name;
 	private ArrayList<Item> items = new ArrayList<Item>();
 	private String description="";
@@ -43,19 +42,11 @@ public class Puzzle
             return dependencyText;
         }
         
-	public int getId() {
-		return id;
-	}
-        
         public Room getNextRoom()
         {
             return nextRoom;
         }
 	
-	public void setId(int id) {
-		this.id = id;
-	}
-	
 	public void addItem(Item i)
 	{
 		items.add(i);

src/java/Room.java

@@ -3,7 +3,6 @@ import java.util.ArrayList;
 
 public class Room
 {
-	private int id;
 	private String name;
 	private String description;
 	private boolean gameoverFlag;
@@ -34,12 +33,6 @@ public class Room
 		return null;
 	}
 	
-	public int getId() {
-		return id;
-	}
-	public void setId(int id) {
-		this.id = id;
-	}
 	public String getName() {
 		return name;
 	}