Merge pull request #8 from nissayeva/master

Added features to game, closes #7
ucsb-cs56-projects-icebox · Mar 9, 2014 · 137356f · 137356f
2 parents 54af3a1 + edf24ab
commit 137356f
Show file tree

Hide file tree

Showing 29 changed files with 7 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/bin/.DS_Store b/bin/.DS_Store
diff --git a/bin/KitchenThings/.DS_Store b/bin/KitchenThings/.DS_Store
diff --git a/bin/KitchenThings/Table_Item_Lights.png b/bin/KitchenThings/Table_Item_Lights.png
diff --git a/bin/KitchenThings/Table_Item_Lights2.png b/bin/KitchenThings/Table_Item_Lights2.png
diff --git a/bin/KitchenThings/Table_Item_Window.png b/bin/KitchenThings/Table_Item_Window.png
diff --git a/bin/KitchenThings/Table_Item_Window2.png b/bin/KitchenThings/Table_Item_Window2.png
diff --git a/bin/LivingRoomThings/.DS_Store b/bin/LivingRoomThings/.DS_Store
diff --git a/bin/LivingRoomThings/Livingroom_Item_Rug.png b/bin/LivingRoomThings/Livingroom_Item_Rug.png
diff --git a/bin/LivingRoomThings/Livingroom_Item_Rug2.png b/bin/LivingRoomThings/Livingroom_Item_Rug2.png
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/BedroomThings/Bedroom_Item_Light.png b/src/BedroomThings/Bedroom_Item_Light.png
diff --git a/src/BedroomThings/Bedroom_Item_Light2.png b/src/BedroomThings/Bedroom_Item_Light2.png
diff --git a/src/BedroomThings/Bedroom_Item_Pillow.png b/src/BedroomThings/Bedroom_Item_Pillow.png
diff --git a/src/BedroomThings/Bedroom_Item_Pillow2.png b/src/BedroomThings/Bedroom_Item_Pillow2.png
diff --git a/src/BedroomThings/Bedroom_Item_Poster.png b/src/BedroomThings/Bedroom_Item_Poster.png
diff --git a/src/BedroomThings/Bedroom_Item_Poster2.png b/src/BedroomThings/Bedroom_Item_Poster2.png
diff --git a/src/Bedroom_Background.png b/src/Bedroom_Background.png
diff --git a/src/Bedroom_Icon.png b/src/Bedroom_Icon.png
diff --git a/src/Game.java b/src/Game.java
@@ -64,10 +64,11 @@ private void initiate(){
 		Room dashain = new Room("Dashain",this,"src/Dashain_Background.png","src/Dashain_Icon.png",new File("src/DashainThings"),this);
 		Room kitchen = new Room("Kitchen",this,"src/Table_Background.png","src/Table_Icon.png",new File("src/KitchenThings"),this);
 		Room livingRoom = new Room("LivingRoom",this,"src/Living Room_Background.png","src/Living Room_Icon.png",new File("src/LivingRoomThings"),this);
+		Room bedroom = new Room("Bedroom",this,"src/Bedroom_Background.png","src/Bedroom_Icon.png",new File("src/BedroomThings"),this);
 		rooms.add(dashain);
 		rooms.add(kitchen);
 		rooms.add(livingRoom);
-
+		rooms.add(bedroom);
 
 
 		currentRoom = rooms.get(0);

diff --git a/src/KitchenThings/.DS_Store b/src/KitchenThings/.DS_Store
diff --git a/src/KitchenThings/Table_Item_Lights.png b/src/KitchenThings/Table_Item_Lights.png
diff --git a/src/KitchenThings/Table_Item_Lights2.png b/src/KitchenThings/Table_Item_Lights2.png
diff --git a/src/KitchenThings/Table_Item_Window.png b/src/KitchenThings/Table_Item_Window.png
diff --git a/src/KitchenThings/Table_Item_Window2.png b/src/KitchenThings/Table_Item_Window2.png
diff --git a/src/LivingRoomThings/.DS_Store b/src/LivingRoomThings/.DS_Store
diff --git a/src/LivingRoomThings/Livingroom_Item_Rug.png b/src/LivingRoomThings/Livingroom_Item_Rug.png
diff --git a/src/LivingRoomThings/Livingroom_Item_Rug2.png b/src/LivingRoomThings/Livingroom_Item_Rug2.png
diff --git a/src/Room.java b/src/Room.java
@@ -97,6 +97,10 @@ public <E extends JPanel> Room(String name,E j,String bgImgPath,String iconImgPa
                     			thingName.length()>8+"Dashain".length()&&
                     			thingName.substring(thingName.length()-8-"Dashain".length(),thingName.length()-8).equals("Dashain")){
                     		room = "Dashain";
+                    	}else if(
+                    			thingName.length()>8+"Bedroom".length()&&
+                    			thingName.substring(thingName.length()-8-"Bedroom".length(),thingName.length()-8).equals("Bedroom")){
+                    		room = "Bedroom";
                     	}
 
                     	if(room!=null){
@@ -231,7 +235,7 @@ public void draw(Graphics g){
 
 	/**
 	 * Draws the Things in the room
-	 * @param g
+	 * @param g-
 	 */
 	private void drawThings(Graphics g){
 		for(int i = things.size()-1;i>=0;i--){