From 2445d42afa616ec0d1a517442e2c6d2b3e4431d9 Mon Sep 17 00:00:00 2001
From: Ojan Thornycroft <othornycroft@gmail.com>
Date: Sun, 26 Oct 2014 15:49:30 -0400
Subject: [PATCH 1/2] Displays the player's health bar after a world change if
 it is damaged  and maintains the player's active weapon through worlds.

---
 DreamStateMachine/Game/Actor/ActorManager.cs | 8 ++++----
 DreamStateMachine/Game/Rendering/Camera.cs   | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/DreamStateMachine/Game/Actor/ActorManager.cs b/DreamStateMachine/Game/Actor/ActorManager.cs
index 691489d..b597944 100644
--- a/DreamStateMachine/Game/Actor/ActorManager.cs
+++ b/DreamStateMachine/Game/Actor/ActorManager.cs
@@ -196,11 +196,11 @@ public void spawnActors(List<SpawnFlag> spawns)
                     if (spawn.className.Equals("player") && player != null)
                     {
                         actorToCopy = (Actor)player.Clone();
+                        actorToCopy.giveWeapon(player.activeWeapon);
                     }
                     else
                     {
-                        actorToCopy = (Actor)actorPrototypes[spawn.className].Clone();
-                        
+                        actorToCopy = (Actor)actorPrototypes[spawn.className].Clone();   
                     }
                     actorToCopy.setGaze(newSightVector);
                     spawnActor(actorToCopy, spawnTile, spawn.spawnType);
@@ -226,13 +226,13 @@ public void respawnActors(List<SpawnFlag> spawns)
         private void World_Change(Object sender, EventArgs eventArgs)
         {
             WorldManager worldManager = (WorldManager)sender;
-            player = worldManager.playerTransfer;
             if (worldManager.curWorld != null)
             {
+                player = worldManager.playerTransfer;
                 List<SpawnFlag> spawns = worldManager.curWorld.getSpawns();
                 spawnActors(spawns);
+                player = null;
             }
-            player = null;
         }
     }
 }
diff --git a/DreamStateMachine/Game/Rendering/Camera.cs b/DreamStateMachine/Game/Rendering/Camera.cs
index 43cf6d1..8b6a7fa 100644
--- a/DreamStateMachine/Game/Rendering/Camera.cs
+++ b/DreamStateMachine/Game/Rendering/Camera.cs
@@ -74,6 +74,10 @@ private void Actor_Spawn(object sender, EventArgs e)
             if (spawnedActor.className == "player")
             {
                 protagonist = spawnedActor;
+                if (protagonist.health != protagonist.maxHealth)
+                {
+                    healthBars[protagonist] = new HealthBar(protagonist, guiTextures["healthBar"]);
+                }
                 //healthBar = new HealthBar(protagonist, healthBarTexture);
             }
         }

From 7a0328b0f41679a3c3a06b2c38a2eadb80cb3de6 Mon Sep 17 00:00:00 2001
From: Ojan Thornycroft <othornycroft@gmail.com>
Date: Sun, 2 Nov 2014 14:54:39 -0500
Subject: [PATCH 2/2] Replacing all files with original files from main
 project.

---
 .../DSMContentProcessor/Actors.xml            | 147 ++++++++-
 .../DSMContentProcessor/Animations.xml        |   2 +-
 .../DSMContentProcessor.contentproj           |  99 +++++-
 .../DSMContentProcessor/Music.xml             |  16 +
 .../DSMContentProcessor/Sounds.xml            |  21 ++
 .../DSMContentProcessor/Weapons.xml           |   3 +-
 .../DSMContentProcessor/Worlds.xml            |  56 ++--
 DreamStateMachine/DreamStateMachine.csproj    |   4 +
 DreamStateMachine/Game/AI/AIController.cs     |   4 +-
 DreamStateMachine/Game/Actor/Actor.cs         |   2 +
 DreamStateMachine/Game/Actor/ActorManager.cs  |  11 +-
 .../Game/Actor/Animations/Attack.cs           |  11 +-
 DreamStateMachine/Game/Actor/Weapon.cs        |   6 +-
 .../Game/Physics/Items/ItemManager.cs         |   5 +-
 .../Game/Physics/PhysicsController.cs         |  87 ++++-
 DreamStateMachine/Game/Rendering/Camera.cs    | 296 +++++++++++++++---
 DreamStateMachine/Game/Sound/Sound.cs         |  20 ++
 DreamStateMachine/Game/Sound/SoundManager.cs  |  38 ++-
 DreamStateMachine/Game/World/Prop.cs          |  56 +++-
 DreamStateMachine/Game/World/PropManager.cs   |  92 +++++-
 DreamStateMachine/Game/World/Room.cs          |  10 +
 DreamStateMachine/Game/World/SpawnFlag.cs     |   1 +
 DreamStateMachine/Game/World/World.cs         |   3 +
 DreamStateMachine/Game/World/WorldConfig.cs   |   7 +-
 DreamStateMachine/Game/World/WorldFactory.cs  | 153 ++++++++-
 DreamStateMachine/Game/World/WorldManager.cs  |  80 ++---
 DreamStateMachine/game.cs                     | 157 +++++++---
 27 files changed, 1178 insertions(+), 209 deletions(-)

diff --git a/DSMContentProject/DSMContentProcessor/Actors.xml b/DSMContentProject/DSMContentProcessor/Actors.xml
index cc6d216..545b8b7 100644
--- a/DSMContentProject/DSMContentProcessor/Actors.xml
+++ b/DSMContentProject/DSMContentProcessor/Actors.xml
@@ -9,6 +9,7 @@
     texWidth="64"
     texHeight="64"
     health="100"
+    damageFactor="1"
     sight="200"
     reach="30">
     <Animation name="punch" type="unnarmed_light_attack"/>
@@ -18,29 +19,85 @@
     <Animation name="walk" type="unarmed_walk"/>
     <Animation name="idle" type="unarmed_idle"/>
   </Actor>
-  
+
   <Actor
-    className="thief"
-    texture="dreamManAnimations"
-    maxSpeed="7"
+    className="skeleton"
+    texture="skeletonAnimations"
+    maxSpeed="4"
     width="25"
     height="25"
     texWidth="64"
     texHeight="64"
-    health="25"
-    sight="200"
-    reach="50">
+    health="50"
+    damageFactor="1"
+    sight="400"
+    reach="25">
+    <Animation name="over_head_smash" type="unnarmed_light_attack"/>
+    <Animation name="walk" type="unarmed_walk"/>
+    <Animation name="idle" type="unarmed_idle"/>
   </Actor>
 
   <Actor
-    className="skeleton"
-    texture="skeletonAnimations"
-    maxSpeed="4"
+    className="greenSkeleton"
+    texture="skeletonAnimationsGreen"
+    maxSpeed="5"
+    width="25"
+    height="25"
+    texWidth="64"
+    texHeight="64"
+    health="30"
+    damageFactor=".7"
+    sight="400"
+    reach="25">
+    <Animation name="over_head_smash" type="unnarmed_light_attack"/>
+    <Animation name="walk" type="unarmed_walk"/>
+    <Animation name="idle" type="unarmed_idle"/>
+  </Actor>
+  
+  <Actor
+    className="redSkeleton"
+    texture="skeletonAnimationsRed"
+    maxSpeed="6"
     width="25"
     height="25"
     texWidth="64"
     texHeight="64"
     health="50"
+    damageFactor="1.2"
+    sight="400"
+    reach="25">
+    <Animation name="over_head_smash" type="unnarmed_light_attack"/>
+    <Animation name="walk" type="unarmed_walk"/>
+    <Animation name="idle" type="unarmed_idle"/>
+  </Actor>
+
+  <Actor
+    className="pinkSkeleton"
+    texture="skeletonAnimationsPink"
+    maxSpeed="5"
+    width="25"
+    height="25"
+    texWidth="64"
+    texHeight="64"
+    health="80"
+    damageFactor="1.5"
+    sight="400"
+    reach="25">
+    <Animation name="over_head_smash" type="unnarmed_light_attack"/>
+    <Animation name="walk" type="unarmed_walk"/>
+    <Animation name="idle" type="unarmed_idle"/>
+  </Actor>
+
+  <Actor
+    className="maskSkeleton"
+    texture="skeletonAnimationsPink"
+    maxSpeed="8"
+    width="25"
+    height="25"
+    texWidth="64"
+    texHeight="64"
+    health="150"
+    damageFactor="2"
     sight="400"
     reach="25">
     <Animation name="over_head_smash" type="unnarmed_light_attack"/>
@@ -48,6 +105,23 @@
     <Animation name="idle" type="unarmed_idle"/>
   </Actor>
 
+  <Actor
+  className="iceSkeleton"
+  texture="skeletonAnimationsBlue"
+  maxSpeed="3"
+  width="25"
+  height="25"
+  texWidth="64"
+  texHeight="64"
+  health="60"
+  damageFactor="1.4"
+  sight="500"
+  reach="25">
+    <Animation name="over_head_smash" type="unnarmed_light_attack"/>
+    <Animation name="walk" type="unarmed_walk"/>
+    <Animation name="idle" type="unarmed_idle"/>
+  </Actor>
+
   <Actor
     className="golem"
     texture="golemAnimations"
@@ -57,6 +131,24 @@
     texWidth="96"
     texHeight="96"
     health="60"
+    damageFactor="1"
+    sight="600"
+    reach="20">
+    <Animation name="heavy_punch" type="unnarmed_light_attack"/>
+    <Animation name="slow_walk" type="unarmed_walk"/>
+    <Animation name="idle" type="unarmed_idle"/>
+  </Actor>
+
+  <Actor
+    className="greenGolem"
+    texture="golemAnimationsGreen"
+    maxSpeed="3"
+    width="42"
+    height="42"
+    texWidth="96"
+    texHeight="96"
+    health="30"
+    damageFactor="0.5"
     sight="600"
     reach="20">
     <Animation name="heavy_punch" type="unnarmed_light_attack"/>
@@ -64,6 +156,40 @@
     <Animation name="idle" type="unarmed_idle"/>
   </Actor>
 
+  <Actor
+    className="pinkGolem"
+    texture="golemAnimationsPink"
+    maxSpeed="3"
+    width="42"
+    height="42"
+    texWidth="96"
+    texHeight="96"
+    health="80"
+    damageFactor="1.2"
+    sight="500"
+    reach="20">
+    <Animation name="heavy_punch" type="unnarmed_light_attack"/>
+    <Animation name="slow_walk" type="unarmed_walk"/>
+    <Animation name="idle" type="unarmed_idle"/>
+  </Actor>
+
+  <Actor
+    className="pinkGolem"
+    texture="golemAnimationsRed"
+    maxSpeed="4"
+    width="42"
+    height="42"
+    texWidth="96"
+    texHeight="96"
+    health="100"
+    damageFactor="1.5"
+    sight="800"
+    reach="20">
+    <Animation name="heavy_punch" type="unnarmed_light_attack"/>
+    <Animation name="slow_walk" type="unarmed_walk"/>
+    <Animation name="idle" type="unarmed_idle"/>
+  </Actor>
+
   <Actor
     className="penguin"
     texture="penguinAnimations"
@@ -73,6 +199,7 @@
     texWidth="64"
     texHeight="64"
     health="25"
+    damageFactor="1"
     sight="250"
     reach="20">
     <Animation name="peck" type="unnarmed_light_attack"/>
diff --git a/DSMContentProject/DSMContentProcessor/Animations.xml b/DSMContentProject/DSMContentProcessor/Animations.xml
index e093cc6..bcba60c 100644
--- a/DSMContentProject/DSMContentProcessor/Animations.xml
+++ b/DSMContentProject/DSMContentProcessor/Animations.xml
@@ -31,7 +31,7 @@
     rowIndex="1">
     <Frame
     frameIndex="3"
-    damage="50">
+    damage="20">
       <AttackBox viewOffsetX="0"
       viewOffsetY="30"
       attackWidth="40"
diff --git a/DSMContentProject/DSMContentProcessor/DSMContentProcessor.contentproj b/DSMContentProject/DSMContentProcessor/DSMContentProcessor.contentproj
index 7a3b944..99f7883 100644
--- a/DSMContentProject/DSMContentProcessor/DSMContentProcessor.contentproj
+++ b/DSMContentProject/DSMContentProcessor/DSMContentProcessor.contentproj
@@ -204,7 +204,7 @@
     <Compile Include="StainedGlassAndSpookySkeletons.mp3">
       <Name>StainedGlassAndSpookySkeletons</Name>
       <Importer>Mp3Importer</Importer>
-      <Processor>MGSongProcessor</Processor>
+      <Processor>MGSoundEffectProcessor</Processor>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
     <Compile Include="TempleFloor.png">
@@ -240,6 +240,7 @@
       <Name>Worlds</Name>
       <Importer>XmlImporter</Importer>
       <Processor>PassThroughProcessor</Processor>
+      <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -273,7 +274,7 @@
     <Compile Include="LumiasGrove.mp3">
       <Name>LumiasGrove</Name>
       <Importer>Mp3Importer</Importer>
-      <Processor>SongProcessor</Processor>
+      <Processor>MGSoundEffectProcessor</Processor>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
   </ItemGroup>
@@ -281,7 +282,7 @@
     <Compile Include="GoodNight.mp3">
       <Name>GoodNight</Name>
       <Importer>Mp3Importer</Importer>
-      <Processor>SongProcessor</Processor>
+      <Processor>MGSoundEffectProcessor</Processor>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
   </ItemGroup>
@@ -289,7 +290,7 @@
     <Compile Include="CrystallineDreams.mp3">
       <Name>CrystallineDreams</Name>
       <Importer>Mp3Importer</Importer>
-      <Processor>SongProcessor</Processor>
+      <Processor>MGSoundEffectProcessor</Processor>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
   </ItemGroup>
@@ -297,7 +298,7 @@
     <Compile Include="Steps.mp3">
       <Name>Steps</Name>
       <Importer>Mp3Importer</Importer>
-      <Processor>MGSongProcessor</Processor>
+      <Processor>MGSoundEffectProcessor</Processor>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
   </ItemGroup>
@@ -316,6 +317,7 @@
       <Name>splashScreen</Name>
       <Importer>TextureImporter</Importer>
       <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
     <Compile Include="titlePanel.png">
       <Name>titlePanel</Name>
@@ -333,6 +335,93 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="creditsBtnUnfocused.png">
+      <Name>creditsBtnUnfocused</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+    <Compile Include="creditsBtnFocused.png">
+      <Name>creditsBtnFocused</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="golemAnimationsGreen.png">
+      <Name>golemAnimationsGreen</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+    <Compile Include="golemAnimationsPink.png">
+      <Name>golemAnimationsPink</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+    <Compile Include="golemAnimationsRed.png">
+      <Name>golemAnimationsRed</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+    <Compile Include="skeletonAnimationsBlue.png">
+      <Name>skeletonAnimationsBlue</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+    <Compile Include="skeletonAnimationsGreen.png">
+      <Name>skeletonAnimationsGreen</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+    <Compile Include="skeletonAnimationsMask.png">
+      <Name>skeletonAnimationsMask</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+    <Compile Include="skeletonAnimationsPink.png">
+      <Name>skeletonAnimationsPink</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+    <Compile Include="skeletonAnimationsRed.png">
+      <Name>skeletonAnimationsRed</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Props.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Name>Props</Name>
+      <Importer>XmlImporter</Importer>
+      <Processor>PassThroughProcessor</Processor>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="door.png">
+      <Name>door</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="potion.png">
+      <Name>potion</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--
       To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/DSMContentProject/DSMContentProcessor/Music.xml b/DSMContentProject/DSMContentProcessor/Music.xml
index dd99aef..8144b09 100644
--- a/DSMContentProject/DSMContentProcessor/Music.xml
+++ b/DSMContentProject/DSMContentProcessor/Music.xml
@@ -4,4 +4,20 @@
     name="templeTheme"
     filePath="StainedGlassAndSpookySkeletons">
   </Song>
+  <Song
+    name="forestTheme"
+    filePath="LumiasGrove">
+  </Song>
+  <Song
+    name="nightmareTheme"
+    filePath="Steps">
+  </Song>
+  <Song
+    name="iceTheme"
+    filePath="CrystallineDreams">
+  </Song>
+  <Song
+    name="tutorialTheme"
+    filePath="GoodNight">
+  </Song>
 </Songs>
diff --git a/DSMContentProject/DSMContentProcessor/Sounds.xml b/DSMContentProject/DSMContentProcessor/Sounds.xml
index 019233b..c4dd830 100644
--- a/DSMContentProject/DSMContentProcessor/Sounds.xml
+++ b/DSMContentProject/DSMContentProcessor/Sounds.xml
@@ -14,4 +14,25 @@
     className="hurt1"
     filePath="sfx/hurt1">
   </Sound>
+
+  <Sound
+    className="templeTheme"
+    filePath="StainedGlassAndSpookySkeletons">
+  </Sound>
+  <Sound
+    className="forestTheme"
+    filePath="LumiasGrove">
+  </Sound>
+  <Sound
+    className="nightmareTheme"
+    filePath="Steps">
+  </Sound>
+  <Sound
+    className="iceTheme"
+    filePath="CrystallineDreams">
+  </Sound>
+  <Sound
+    className="creditsTheme"
+    filePath="GoodNight">
+  </Sound>
 </Sounds>
diff --git a/DSMContentProject/DSMContentProcessor/Weapons.xml b/DSMContentProject/DSMContentProcessor/Weapons.xml
index 8d387de..ca7980d 100644
--- a/DSMContentProject/DSMContentProcessor/Weapons.xml
+++ b/DSMContentProject/DSMContentProcessor/Weapons.xml
@@ -2,7 +2,8 @@
 <Weapons>
   <Weapon
     name="bone"
-    texture="bone">
+    texture="bone"
+    damage="25">
     <Animation name="holding_weapon_walk" type="holding_weapon_walk"/>
     <Animation name="holding_weapon_idle" type="holding_weapon_idle"/>
     <Animation name="light_weapon_attack" type="light_weapon_attack"/>
diff --git a/DSMContentProject/DSMContentProcessor/Worlds.xml b/DSMContentProject/DSMContentProcessor/Worlds.xml
index cabf19f..420fc48 100644
--- a/DSMContentProject/DSMContentProcessor/Worlds.xml
+++ b/DSMContentProject/DSMContentProcessor/Worlds.xml
@@ -6,8 +6,15 @@
     width="50"
     height="50"
     tileSize="64"
-    themeMusic="LumiasGrove">
-    <Enemy class="skeleton">
+    themeMusic="forestTheme">
+    <Enemy class="skeleton"
+           difficulty="2">
+    </Enemy>
+    <Enemy class="greenSkeleton"
+           difficulty="4">
+    </Enemy>
+    <Enemy class="greenGolem"
+           difficulty="3">
     </Enemy>
   </World>
   <World
@@ -16,8 +23,18 @@
     width="50"
     height="50"
     tileSize="96"
-    themeMusic="Steps">
-    <Enemy class="skeleton">
+    themeMusic="nightmareTheme">
+    <Enemy class="skeleton"
+           difficulty="2">
+    </Enemy>
+    <Enemy class="maskSkeleton"
+           difficulty="10">
+    </Enemy>
+    <Enemy class="pinkSkeleton"
+           difficulty="15">
+    </Enemy>
+    <Enemy class="pinkGolem"
+           difficulty="8">
     </Enemy>
   </World>
   <World
@@ -26,8 +43,16 @@
     width="50"
     height="50"
     tileSize="64"
-    themeMusic="StainedGlassAndSpookySkeletons">
-    <Enemy class="skeleton">
+    themeMusic="templeTheme">
+    <Enemy class="skeleton"
+           difficulty="2">
+    </Enemy>
+    <Enemy class="redSkeleton"
+           difficulty="5">
+    </Enemy>
+    <Enemy class="redGolem"
+           difficulty="7">
+           
     </Enemy>
   </World>
   <World
@@ -36,20 +61,15 @@
     width="50"
     height="50"
     tileSize="64"
-    themeMusic="CrystallineDreams">
-    <Enemy class="golem">
+    themeMusic="iceTheme">
+    <Enemy class="iceSkeleton"
+           difficulty="3">
     </Enemy>
-    <Enemy class="penguin">
+    <Enemy class="golem"
+           difficulty="5">
     </Enemy>
-  </World>
-  <World
-    worldName="tutorial"
-    worldTexture="TempleFloor"
-    width="50"
-    height="50"
-    tileSize="64"
-    themeMusic="GoodNight">
-    <Enemy class="skeleton">
+    <Enemy class="penguin"
+           difficulty="1">
     </Enemy>
   </World>
 </Worlds>
\ No newline at end of file
diff --git a/DreamStateMachine/DreamStateMachine.csproj b/DreamStateMachine/DreamStateMachine.csproj
index 05e676a..7ab0607 100644
--- a/DreamStateMachine/DreamStateMachine.csproj
+++ b/DreamStateMachine/DreamStateMachine.csproj
@@ -62,6 +62,7 @@
     <Compile Include="game\Events\PickupEventArgs.cs" />
     <Compile Include="game\Events\SpawnEventArgs.cs" />
     <Compile Include="game\GUI\Button.cs" />
+    <Compile Include="game\GUI\MovingLabel.cs" />
     <Compile Include="game\GUI\WorldLabel.cs" />
     <Compile Include="game\GUI\HealthBar.cs" />
     <Compile Include="game\GUI\Label.cs" />
@@ -80,6 +81,9 @@
     <Compile Include="game\Rendering\IDrawable.cs" />
     <Compile Include="game\Sound\Sound.cs" />
     <Compile Include="game\Sound\SoundManager.cs" />
+    <Compile Include="game\World\Door.cs" />
+    <Compile Include="game\World\EnemyConfig.cs" />
+    <Compile Include="game\World\Potion.cs" />
     <Compile Include="game\World\Prop.cs" />
     <Compile Include="game\World\PropManager.cs" />
     <Compile Include="game\World\Room.cs" />
diff --git a/DreamStateMachine/Game/AI/AIController.cs b/DreamStateMachine/Game/AI/AIController.cs
index 113609a..55f9a3e 100644
--- a/DreamStateMachine/Game/AI/AIController.cs
+++ b/DreamStateMachine/Game/AI/AIController.cs
@@ -30,11 +30,11 @@ public AIController()
         private void Actor_Spawn(object sender, SpawnEventArgs e)
         {
             Actor spawnedActor = (Actor)sender;
-            if (e.spawnType == 1)
+            if (spawnedActor.className == "player")
             {
                 protagonist = spawnedActor;
             }
-            else if (e.spawnType == 2)
+            else
             {
                 ActionList behaviorList = new ActionList(spawnedActor);
                 Neutral neutral = new Neutral(behaviorList, spawnedActor);
diff --git a/DreamStateMachine/Game/Actor/Actor.cs b/DreamStateMachine/Game/Actor/Actor.cs
index 7f4bad8..3cd8ed5 100644
--- a/DreamStateMachine/Game/Actor/Actor.cs
+++ b/DreamStateMachine/Game/Actor/Actor.cs
@@ -48,6 +48,7 @@ class Actor:ICloneable, IDrawable
         public int health;
         public int reach;
         public int sight;
+        public float damageFactor;
         public float rotationVelocity;
         public float maxRotationVelocity;
         
@@ -173,6 +174,7 @@ public Object Clone()
             actorCopy.animations = animations;
             actorCopy.className = className;
             actorCopy.color = new Color(color.ToVector3());
+            actorCopy.damageFactor = damageFactor;
             actorCopy.gripPoint = new Point(gripPoint.X, gripPoint.Y);
             actorCopy.maxHealth = maxHealth;
             actorCopy.health = health;
diff --git a/DreamStateMachine/Game/Actor/ActorManager.cs b/DreamStateMachine/Game/Actor/ActorManager.cs
index b597944..552e70f 100644
--- a/DreamStateMachine/Game/Actor/ActorManager.cs
+++ b/DreamStateMachine/Game/Actor/ActorManager.cs
@@ -36,6 +36,7 @@ public void initActorConfig(ContentManager content, String actorConfigFile)
             String animationName;
             String animationType;
             Texture2D actorTexture;
+            float actorDamageFactor;
             int actorMaxSpeed;
             int actorWidth;
             int actorHeight;
@@ -55,12 +56,14 @@ public void initActorConfig(ContentManager content, String actorConfigFile)
                 texWidth = int.Parse(actor.Attribute("texWidth").Value);
                 texHeight = int.Parse(actor.Attribute("texHeight").Value);
                 actorHealth = int.Parse(actor.Attribute("health").Value);
+                actorDamageFactor = float.Parse(actor.Attribute("damageFactor").Value);
                 actorSight = int.Parse(actor.Attribute("sight").Value);
                 actorReach = int.Parse(actor.Attribute("reach").Value);
                 actorPrototypes[actorClass] = new Actor(actorTexture, actorWidth, actorHeight, texWidth, texHeight);
                 actorPrototypes[actorClass].className = actorClass;
                 actorPrototypes[actorClass].maxHealth = actorHealth;
                 actorPrototypes[actorClass].health = actorHealth;
+                actorPrototypes[actorClass].damageFactor = actorDamageFactor;
                 actorPrototypes[actorClass].maxSpeed = actorMaxSpeed;
                 actorPrototypes[actorClass].sight = actorSight;
                 actorPrototypes[actorClass].reach = actorReach;
@@ -196,11 +199,11 @@ public void spawnActors(List<SpawnFlag> spawns)
                     if (spawn.className.Equals("player") && player != null)
                     {
                         actorToCopy = (Actor)player.Clone();
-                        actorToCopy.giveWeapon(player.activeWeapon);
                     }
                     else
                     {
-                        actorToCopy = (Actor)actorPrototypes[spawn.className].Clone();   
+                        actorToCopy = (Actor)actorPrototypes[spawn.className].Clone();
+                        
                     }
                     actorToCopy.setGaze(newSightVector);
                     spawnActor(actorToCopy, spawnTile, spawn.spawnType);
@@ -226,13 +229,13 @@ public void respawnActors(List<SpawnFlag> spawns)
         private void World_Change(Object sender, EventArgs eventArgs)
         {
             WorldManager worldManager = (WorldManager)sender;
+            player = worldManager.playerTransfer;
             if (worldManager.curWorld != null)
             {
-                player = worldManager.playerTransfer;
                 List<SpawnFlag> spawns = worldManager.curWorld.getSpawns();
                 spawnActors(spawns);
-                player = null;
             }
+            player = null;
         }
     }
 }
diff --git a/DreamStateMachine/Game/Actor/Animations/Attack.cs b/DreamStateMachine/Game/Actor/Animations/Attack.cs
index c332c1d..cf542e1 100644
--- a/DreamStateMachine/Game/Actor/Animations/Attack.cs
+++ b/DreamStateMachine/Game/Actor/Animations/Attack.cs
@@ -86,7 +86,16 @@ public override void onEnterFrame(int frame)
 
                     attackBoxes.Add(damageRect);
                 }
-                DamageInfo damageInfo = new DamageInfo(owner, frameInfo.attackDamage, this.attackBoxes);
+                DamageInfo damageInfo;
+                if (owner.activeWeapon != null)
+                {
+                    damageInfo = new DamageInfo(owner, (int)(owner.activeWeapon.damage * owner.damageFactor), this.attackBoxes);
+                }
+                else 
+                { 
+                    damageInfo = new DamageInfo(owner, (int)(frameInfo.attackDamage * owner.damageFactor), this.attackBoxes);
+                }
+
                 owner.onAttack(damageInfo);
                 attackBoxes.Clear();
             }
diff --git a/DreamStateMachine/Game/Actor/Weapon.cs b/DreamStateMachine/Game/Actor/Weapon.cs
index 7ab4ec9..029eecc 100644
--- a/DreamStateMachine/Game/Actor/Weapon.cs
+++ b/DreamStateMachine/Game/Actor/Weapon.cs
@@ -23,12 +23,14 @@ class Weapon: ICloneable, IDrawable
         public Stance curStance;
         public Texture2D tex;
         public Rectangle dimensions;
+        public int damage;
         public float frameRotation;
         public float rotation;
 
-        public Weapon(String name, Texture2D tex, Dictionary<String, String> animations, Dictionary<String, Stance> stances)
+        public Weapon(String name, Texture2D tex,int damage, Dictionary<String, String> animations, Dictionary<String, Stance> stances)
         {
             this.stances = stances;
+            this.damage = damage;
             this.animations = animations;
             this.name = name;
             this.tex = tex;
@@ -36,7 +38,7 @@ public Weapon(String name, Texture2D tex, Dictionary<String, String> animations,
         }
 
         public Object Clone(){
-            Weapon clonedWeapon = new Weapon(name, tex, animations, stances);
+            Weapon clonedWeapon = new Weapon(name, tex, damage, animations, stances);
             return clonedWeapon;
         }
 
diff --git a/DreamStateMachine/Game/Physics/Items/ItemManager.cs b/DreamStateMachine/Game/Physics/Items/ItemManager.cs
index c497071..2ca2823 100644
--- a/DreamStateMachine/Game/Physics/Items/ItemManager.cs
+++ b/DreamStateMachine/Game/Physics/Items/ItemManager.cs
@@ -37,6 +37,7 @@ public void initWeaponConfig(ContentManager content, String weaponConfigFile)
             Texture2D weaponTex;
             String animationName;
             String animationType;
+            int weaponDamage;
             String stanceName;
             Vector2 gripPoint;
             Rectangle drawBox;
@@ -48,7 +49,7 @@ public void initWeaponConfig(ContentManager content, String weaponConfigFile)
                 
                 weaponName = weapon.Attribute("name").Value;
                 weaponTex = content.Load<Texture2D>(weapon.Attribute("texture").Value);
-
+                weaponDamage = int.Parse(weapon.Attribute("damage").Value);
                 animations = weapon.Elements("Animation").ToList();
 
                 foreach(XElement animation in animations){
@@ -77,7 +78,7 @@ public void initWeaponConfig(ContentManager content, String weaponConfigFile)
                     };
                 }
 
-                weaponPrototypes[weaponName] = new Weapon(weaponName, weaponTex, weaponAnimations, weaponStances);
+                weaponPrototypes[weaponName] = new Weapon(weaponName, weaponTex, weaponDamage, weaponAnimations, weaponStances);
 
             }
         }
diff --git a/DreamStateMachine/Game/Physics/PhysicsController.cs b/DreamStateMachine/Game/Physics/PhysicsController.cs
index 865a379..736c4ea 100644
--- a/DreamStateMachine/Game/Physics/PhysicsController.cs
+++ b/DreamStateMachine/Game/Physics/PhysicsController.cs
@@ -13,6 +13,7 @@ namespace DreamStateMachine.Behaviors
     class PhysicsController
     {
         List<Actor> actors;
+        List<Prop> props;
         World world;
         Random random;
         Rectangle predictedMove;
@@ -25,9 +26,12 @@ public PhysicsController()
         {
 
             actors = new List<Actor>();
+            props = new List<Prop>();
             random = new Random();
 
             Actor.Spawn += new EventHandler<SpawnEventArgs>(Actor_Spawn);
+            Prop.Spawn += new EventHandler<SpawnEventArgs>(Prop_Spawn);
+            Prop.Remove += new EventHandler<EventArgs>(Prop_Remove);
             Actor.Death += new EventHandler<EventArgs>(Actor_Death);
             WorldManager.worldChange +=new EventHandler<EventArgs>(World_Change);
         }
@@ -41,6 +45,20 @@ private void Actor_Spawn(object sender, SpawnEventArgs e)
             
         }
 
+        private void Prop_Spawn(object sender, SpawnEventArgs e)
+        {
+            Prop spawnedProp = (Prop)sender;
+            Point spawnPoint = new Point(e.spawnTile.X * world.tileSize, e.spawnTile.Y * world.tileSize);
+            spawnedProp.setPos(spawnPoint);
+            props.Add(spawnedProp);
+        }
+
+        private void Prop_Remove(object sender, EventArgs e)
+        {
+            Prop toRemoveProp = (Prop)sender;
+            props.Remove(toRemoveProp);
+        }
+
         private void Actor_Death(object sender, EventArgs e)
         {
             Actor deadActor = (Actor)sender;
@@ -50,11 +68,77 @@ private void Actor_Death(object sender, EventArgs e)
         public void update(float dt){
             foreach (Actor actor in actors)
             {
+                this.handlePropCollision(actor);
                 this.handleMapCollision(actor);
                 this.handleMovement(actor);
             }
         }
 
+        public bool collidesWithProp(Prop prop,Rectangle rect)
+        {
+            if(prop.hitBox.Intersects(rect)){
+                return true;
+            }
+            return false;
+        }
+
+        public bool collidesWithProp(Prop prop, Point point)
+        {
+            if (prop.hitBox.Contains(point))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public void handlePropCollision(Actor actor)
+        {
+            Rectangle intersectedRect = new Rectangle();
+            Point newPos = new Point();
+            foreach (Prop prop in props)
+            {
+                if (collidesWithProp(prop, actor.hitBox))
+                {
+                    Rectangle.Intersect(ref actor.hitBox,ref prop.hitBox,out intersectedRect);
+                    if (actor.velocity.X < 0)
+                    {
+                        newPos.X = actor.hitBox.X + intersectedRect.Width + 1;   
+                    }
+                    else if (actor.velocity.X > 0)
+                    {
+                        newPos.X = actor.hitBox.X - intersectedRect.Width - 1;
+                    }
+                    else
+                    {
+                        newPos.X = actor.hitBox.X;
+                    }
+
+                    if (actor.velocity.Y < 0)
+                    {
+                        newPos.Y = actor.hitBox.Y + intersectedRect.Height + 1;
+                    }
+                    else if (actor.velocity.Y > 0)
+                    {
+                        newPos.Y = actor.hitBox.Y - intersectedRect.Height - 1;
+                    }else{
+                        newPos.Y = actor.hitBox.Y;
+                    }
+
+                    if(!collidesWithProp(prop, new Point(newPos.X, actor.hitBox.Y))){
+                        actor.setPos(new Point(newPos.X, actor.hitBox.Y));
+                    }
+                    else if (!collidesWithProp(prop, new Point(actor.hitBox.X, newPos.Y)))
+                    {
+                        actor.setPos(new Point(actor.hitBox.X, newPos.Y));
+                    }
+                    else{
+                        actor.setPos(newPos);
+                    }
+                    
+                }
+                
+            }
+        }
 
         public void handleMapCollision(Actor actor)
         {
@@ -116,8 +200,7 @@ public void handleMapCollision(Actor actor)
                 if (world.isInBounds(predictedMove))
                     actor.setPos(actor.hitBox.X + remainingMovement.X, actor.hitBox.Y + remainingMovement.Y);
 
-            }
-
+            }            
         }
 
         public void handleMovement(Actor actor)
diff --git a/DreamStateMachine/Game/Rendering/Camera.cs b/DreamStateMachine/Game/Rendering/Camera.cs
index 8b6a7fa..5f597db 100644
--- a/DreamStateMachine/Game/Rendering/Camera.cs
+++ b/DreamStateMachine/Game/Rendering/Camera.cs
@@ -14,43 +14,53 @@ class Camera
     {
 
         public event EventHandler<EventArgs> NewGame;
+        public event EventHandler<EventArgs> Tutorial;
+        public event EventHandler<EventArgs> Credits;
+        public event EventHandler<EventArgs> CreditsExit;
 
         public Rectangle drawSpace;
         public List<IDrawable> actors;
+        public List<IDrawable> props;
         public List<IDrawable> menuItems;
         public Dictionary<IDrawable,IDrawable> healthBars;
         public Dictionary<String,Texture2D> guiTextures;
         public List<IDrawable> tutorialGui;
+        List<List<MovingLabel>> credits;
         Actor protagonist;
         SpriteBatch spriteBatch;
         SpriteFont spriteFont;
         bool debug;
         public bool menuEnabled;
+        public bool creditsEnabled;
         IDrawable curWorld;
+        Label helpLabel;
         public UIComponent rootGUIElement;
         UIComponent focusedElement;
         MouseState mouseState;
         MouseState lastMouseState;
         KeyboardState keyboardState;
 
-        //public static event EventHandler<EventArgs> EnableMenu;
-
         public Camera(SpriteBatch sB, Rectangle dS)
         {
             spriteBatch = sB;
             drawSpace = dS;
-            //actors = new List<Actor>();
             actors = new List<IDrawable>();
+            props = new List<IDrawable>();
             menuItems = new List<IDrawable>();
             
             healthBars = new Dictionary<IDrawable, IDrawable>();
             guiTextures = new Dictionary<string,Texture2D>();
             tutorialGui = new List<IDrawable>();
+            credits = new List<List<MovingLabel>>();
             debug = false;
+            menuEnabled = false;
+            creditsEnabled = false;
 
             Actor.Spawn += new EventHandler<SpawnEventArgs>(Actor_Spawn);
+            Prop.Spawn += new EventHandler<SpawnEventArgs>(Prop_Spawn);
             Actor.Hurt += new EventHandler<AttackEventArgs>(Actor_Hurt);
             Actor.Death += new EventHandler<EventArgs>(Actor_Death);
+            Prop.Remove += new EventHandler<EventArgs>(Prop_Remove);
             WorldManager.worldChange += new EventHandler<EventArgs>(World_Change);
 
         }
@@ -64,6 +74,10 @@ public void loadGuiTextures(ContentManager content){
             guiTextures["logo"] = content.Load<Texture2D>("titlePanel");
             guiTextures["newGameButton"] = content.Load<Texture2D>("newGameBtnUnfocused");
             guiTextures["newGameButtonFocused"] = content.Load<Texture2D>("newGameBtnFocused");
+            guiTextures["tutorialButton"] = content.Load<Texture2D>("tutorialBtnUnfocused");
+            guiTextures["tutorialButtonFocused"] = content.Load<Texture2D>("tutorialBtnFocused");
+            guiTextures["creditsButton"] = content.Load<Texture2D>("creditsBtnUnfocused");
+            guiTextures["creditsButtonFocused"] = content.Load<Texture2D>("creditsBtnFocused");
             spriteFont = content.Load<SpriteFont>("SpriteFont1");
         }
 
@@ -74,28 +88,38 @@ private void Actor_Spawn(object sender, EventArgs e)
             if (spawnedActor.className == "player")
             {
                 protagonist = spawnedActor;
-                if (protagonist.health != protagonist.maxHealth)
-                {
-                    healthBars[protagonist] = new HealthBar(protagonist, guiTextures["healthBar"]);
-                }
-                //healthBar = new HealthBar(protagonist, healthBarTexture);
             }
+            if (!healthBars.ContainsKey(spawnedActor) && spawnedActor.health < spawnedActor.maxHealth)
+            {
+                if (spawnedActor.className == "player")
+                    healthBars[spawnedActor] = new HealthBar(spawnedActor, guiTextures["healthBar"]);
+                else
+                    healthBars[spawnedActor] = new HealthBar(spawnedActor, guiTextures["enemyHealthBar"]);
+            }
+        }
+
+        private void Prop_Spawn(object sender, EventArgs e)
+        {
+            Prop spawnedProp = (Prop)sender;
+            props.Add(spawnedProp);
+        }
+
+        private void Prop_Remove(object sender, EventArgs e)
+        {
+            Prop toRemove = (Prop)sender;
+            props.Remove(toRemove);
         }
 
         private void Actor_Hurt(object sender, AttackEventArgs e)
         {
             Actor hurtActor = (Actor)sender;
-            if (healthBars.ContainsKey(hurtActor))
-            {
-            }
-            else
+            if (!healthBars.ContainsKey(hurtActor))
             {
                 if (hurtActor.className == "player")
                     healthBars[hurtActor] = new HealthBar(hurtActor, guiTextures["healthBar"]);
                 else
                     healthBars[hurtActor] = new HealthBar(hurtActor, guiTextures["enemyHealthBar"]);
             }
-            
         }
 
         private void Actor_Death(object sender, EventArgs e)
@@ -105,15 +129,20 @@ private void Actor_Death(object sender, EventArgs e)
             actors.Remove(deadActor);
             if (deadActor.className == "player")
             {
-                Label deadLabel = new Label(spriteFont, "YEAH YOU ARE PRETTY MUCH DEAD HOMBRE");
+                Panel panel = new Panel(guiTextures["whiteSquare"], new Color(Color.TransparentBlack, .1f));
+                panel.dimensions.Width = (int)( drawSpace.Width * 2.5 / 10);
+                panel.dimensions.Height = drawSpace.Width * 1 / 10;
+                panel.dimensions.X = drawSpace.Width / 2 - panel.dimensions.Width/2;
+                panel.dimensions.Y = drawSpace.Height / 2 - panel.dimensions.Height / 2;
+                tutorialGui.Add(panel);
+                Label deadLabel = new Label(spriteFont, "You are dead!");
                 deadLabel.color = Color.Red;
-                deadLabel.dimensions.X = drawSpace.Width / 2 - (int)spriteFont.MeasureString("YEAH YOU ARE PRETTY MUCH DEAD HOMBRE").X / 2;
-                deadLabel.dimensions.Y = drawSpace.Height / 2 - (int)spriteFont.MeasureString("YEAH YOU ARE PRETTY MUCH DEAD HOMBRE").Y / 2;
+                deadLabel.dimensions.X = drawSpace.Width / 2 - (int)spriteFont.MeasureString(deadLabel.contents).X / 2;
+                deadLabel.dimensions.Y = drawSpace.Height / 2 - (int)spriteFont.MeasureString(deadLabel.contents).Y / 2 - 25;
                 tutorialGui.Add(deadLabel);
-                Label helpLabel = new Label(spriteFont, "Press e to start over ya dangus");
-                //label.color = Color.Red;
-                helpLabel.dimensions.X = drawSpace.Width / 2 - (int)spriteFont.MeasureString("Press e to start over ya dangus").X / 2;
-                helpLabel.dimensions.Y = drawSpace.Height / 2 - (int)spriteFont.MeasureString("Press e to start over ya dangus").Y / 2 + 50;
+                Label helpLabel = new Label(spriteFont, "It is 2 spooky 4 you.");
+                helpLabel.dimensions.X = drawSpace.Width / 2 - (int)spriteFont.MeasureString(helpLabel.contents).X / 2;
+                helpLabel.dimensions.Y = drawSpace.Height / 2 - (int)spriteFont.MeasureString(helpLabel.contents).Y / 2 + 25;
                 tutorialGui.Add(helpLabel);
             }
         }
@@ -125,9 +154,6 @@ public void ToggleDebug(){
         public void drawActors()
         {
             IDrawable curActor;
-            //Rectangle normalizedPosition;
-            //Rectangle sourceRectangle;
-            //Texture2D tex;
 
             for (int i = 0; i < actors.Count; i++)
             {
@@ -139,6 +165,18 @@ public void drawActors()
             }
         }
 
+        public void drawCredits()
+        {
+            helpLabel.draw(spriteBatch, drawSpace, guiTextures["debugSquare"], false);
+            foreach (List<MovingLabel> creditList in credits)
+            {
+                foreach (MovingLabel mention in creditList)
+                {
+                    mention.draw(spriteBatch, drawSpace, guiTextures["debugSquare"], false);
+                }
+            }
+        }
+
         public void drawFloor()
         {
             curWorld.draw(spriteBatch, drawSpace, guiTextures["debugSquare"], debug);
@@ -160,43 +198,87 @@ public void drawGUI()
             {
                 entry.draw(spriteBatch, drawSpace, guiTextures["debugSquare"], debug);
             }
-            //healthBar.draw();
+        }
+
+        public void drawProps()
+        {
+            foreach (Prop prop in props)
+            {
+                prop.draw(spriteBatch, drawSpace, guiTextures["debugSquare"], false);
+            }
         }
 
         public void enterStartMenu()
         {
             menuItems.Clear();
+            credits.Clear();
             drawSpace.X = 0;
             drawSpace.Y = 0;
+
             Panel bg = new Panel(guiTextures["menuPanel"], new Color(255, 255, 255));
             bg.dimensions.X = drawSpace.X;
             bg.dimensions.Y = drawSpace.Y;
             bg.dimensions.Width = drawSpace.Width;
             bg.dimensions.Height = drawSpace.Height;
+
             Panel logo = new Panel(guiTextures["logo"], new Color(255, 255, 255));
-            logo.dimensions.X = drawSpace.Width / 2 - guiTextures["logo"].Width /2;
+            logo.dimensions.Width = drawSpace.Width * 4 / 5;
+            logo.dimensions.Height = drawSpace.Height * 2 / 10;
+            logo.dimensions.X = drawSpace.Width / 2 - logo.dimensions.Width / 2;
             logo.dimensions.Y = 50;
-            logo.dimensions.Width = guiTextures["logo"].Width;
-            logo.dimensions.Height = guiTextures["logo"].Height * 4 / 5;
+            
+            bg.addChild(logo);
+
             Button newGameButton = new Button(guiTextures["newGameButton"]);
-            newGameButton.dimensions.X = drawSpace.Width / 2 - guiTextures["newGameButton"].Width / 2;
-            newGameButton.dimensions.Y = 400;
-            newGameButton.dimensions.Width = guiTextures["newGameButton"].Width;
-            newGameButton.dimensions.Height = guiTextures["newGameButton"].Height * 4 / 5;
+            newGameButton.dimensions.Width = drawSpace.Width * 2 / 5;
+            newGameButton.dimensions.Height = drawSpace.Height / 6;
+            newGameButton.dimensions.X = drawSpace.Width / 2 - newGameButton.dimensions.Width / 2;
+            newGameButton.dimensions.Y = drawSpace.Height * 3 / 10;
             newGameButton.onClick = newGameClicked;
             bg.addChild(newGameButton);
-            bg.addChild(logo);
+
+            Button tutorialButton = new Button(guiTextures["tutorialButton"]);
+            tutorialButton.dimensions.Width = drawSpace.Width * 2 / 5;
+            tutorialButton.dimensions.Height = drawSpace.Height / 6;
+            tutorialButton.dimensions.X = drawSpace.Width / 2 - tutorialButton.dimensions.Width / 2;
+            tutorialButton.dimensions.Y = drawSpace.Height * 5 / 10;
+            tutorialButton.onClick = tutorialClicked;
+            bg.addChild(tutorialButton);
+
+            Button creditsButton = new Button(guiTextures["creditsButton"]);
+            creditsButton.dimensions.Width = drawSpace.Width * 2 / 5;
+            creditsButton.dimensions.Height = drawSpace.Height / 6;
+            creditsButton.dimensions.X = drawSpace.Width / 2 - creditsButton.dimensions.Width / 2;
+            creditsButton.dimensions.Y = drawSpace.Height * 7 / 10;
+            creditsButton.onClick = creditsClicked;
+            bg.addChild(creditsButton);
+
+
             menuItems.Add(bg);
             rootGUIElement = bg;
             menuEnabled = true;
             //EnableMenu(this, EventArgs.Empty);
         }
 
-        public void newGameClicked()
+        private void newGameClicked()
         {
             NewGame(this, EventArgs.Empty);
         }
 
+        private void tutorialClicked()
+        {
+            Tutorial(this, EventArgs.Empty);
+        }
+
+        private void creditsClicked()
+        {
+            Credits(this, EventArgs.Empty);
+        }
+
+        private void creditsExit(){
+            CreditsExit(this, EventArgs.Empty);
+        }
+
         public void handleGuiControls()
         {
             mouseState = Mouse.GetState();
@@ -206,11 +288,16 @@ public void handleGuiControls()
                     mouseMoved(mouseState.X, mouseState.Y);
             }
 
-            if (focusedElement != null && mouseState.LeftButton == ButtonState.Pressed)
+            if (focusedElement != null && mouseState.LeftButton == ButtonState.Pressed && menuEnabled)
             {
                 focusedElement.onClick();
             }
 
+            if (keyboardState.IsKeyDown(Keys.E) && creditsEnabled)
+            {
+                creditsExit();
+            }
+
 
             if(keyboardState.IsKeyDown(Keys.Down)  || keyboardState.IsKeyDown(Keys.S)){
                 
@@ -257,12 +344,151 @@ public void startMenuUpdate(float dt)
             
         }
 
+        public void creditsUpdate(float dt)
+        {
+            foreach (List<MovingLabel> creditList in credits)
+            {
+                foreach (MovingLabel mention in creditList)
+                {
+                    mention.update(dt);
+                }
+            }
+        }
+
         public void gameUpdate(float dt)
         {
             if (drawSpace.Center.X != protagonist.hitBox.Center.X || drawSpace.Center.Y != protagonist.hitBox.Center.Y)
                 setFocus(protagonist.hitBox.Center.X, protagonist.hitBox.Center.Y);
         }
 
+        public void rollCredits()
+        {
+
+            helpLabel = new MovingLabel(spriteFont, "Press E to go back to the menu.");
+            helpLabel.dimensions.X = drawSpace.Width / 2 + 200;
+            helpLabel.dimensions.Y = 20;
+
+
+            MovingLabel header = new MovingLabel(spriteFont, "DREAM STATE MACHINE");
+            List<MovingLabel> gameHeaderList = new List<MovingLabel>();
+            gameHeaderList.Add(header);
+            credits.Add(gameHeaderList);
+            MovingLabel projectLeadHeader = new MovingLabel(spriteFont, "Connor Brinkmann");
+            MovingLabel projectLead = new MovingLabel(spriteFont, "Project lead, Game Architect, Programming, Animation, World design");
+            List<MovingLabel> projectLeadList = new List<MovingLabel>();
+            projectLeadList.Add(projectLeadHeader);
+            projectLeadList.Add(projectLead);
+            credits.Add(projectLeadList);
+
+            MovingLabel MitchProgrammerHeader = new MovingLabel(spriteFont, "Mitchell McClellan");
+            MovingLabel MitchProgrammer = new MovingLabel(spriteFont, "Sound programmer, Item programmer, Character design/animation");
+            List<MovingLabel> MitchProgrammerList = new List<MovingLabel>();
+            MitchProgrammerList.Add(MitchProgrammerHeader);
+            MitchProgrammerList.Add(MitchProgrammer);
+            credits.Add(MitchProgrammerList);
+
+            MovingLabel JeremyProgrammerHeader = new MovingLabel(spriteFont, "Jeremy Feltracco");
+            MovingLabel JeremyProgrammer = new MovingLabel(spriteFont, "Game input programming, Controller support programming");
+            List<MovingLabel> JeremyProgrammerList = new List<MovingLabel>();
+            JeremyProgrammerList.Add(JeremyProgrammerHeader);
+            JeremyProgrammerList.Add(JeremyProgrammer);
+            credits.Add(JeremyProgrammerList);
+
+            MovingLabel AaronProgrammerHeader = new MovingLabel(spriteFont, "Aaron Andrews");
+            MovingLabel AaronProgrammer = new MovingLabel(spriteFont, "Prop programming");
+            List<MovingLabel> AaronProgrammerList = new List<MovingLabel>();
+            AaronProgrammerList.Add(AaronProgrammerHeader);
+            AaronProgrammerList.Add(AaronProgrammer);
+            credits.Add(AaronProgrammerList);
+
+            MovingLabel MattProgrammerHeader = new MovingLabel(spriteFont, "Matt Schmidt");
+            MovingLabel MattProgrammer = new MovingLabel(spriteFont, "Linux assistance");
+            List<MovingLabel> MattProgrammerList = new List<MovingLabel>();
+            MattProgrammerList.Add(MattProgrammerHeader);
+            MattProgrammerList.Add(MattProgrammer);
+            credits.Add(MattProgrammerList);
+
+            MovingLabel HoKeunProgrammerHeader = new MovingLabel(spriteFont, "Ho Keun Kim");
+            MovingLabel HoKeunProgrammer = new MovingLabel(spriteFont, "Tutorial World programming/design");
+            List<MovingLabel> HoKeunProgrammerList = new List<MovingLabel>();
+            HoKeunProgrammerList.Add(HoKeunProgrammerHeader);
+            HoKeunProgrammerList.Add(HoKeunProgrammer);
+            credits.Add(HoKeunProgrammerList);
+
+            MovingLabel OjanProgrammerHeader = new MovingLabel(spriteFont, "Ojan Croft");
+            MovingLabel OjanProgrammer = new MovingLabel(spriteFont, "Rendering programming, world transition programming");
+            List<MovingLabel> OjanProgrammerList = new List<MovingLabel>();
+            OjanProgrammerList.Add(OjanProgrammerHeader);
+            OjanProgrammerList.Add(OjanProgrammer);
+            credits.Add(OjanProgrammerList);
+
+            MovingLabel PatrickArtistHeader = new MovingLabel(spriteFont, "Patrick Sewell");
+            MovingLabel PatrickArtist = new MovingLabel(spriteFont, "Menu design/art, additional Sound effects, Health bar design");
+            List<MovingLabel> PatrickArtistList = new List<MovingLabel>();
+            PatrickArtistList.Add(PatrickArtistHeader);
+            PatrickArtistList.Add(PatrickArtist);
+            credits.Add(PatrickArtistList);
+
+            MovingLabel LarryArtistHeader = new MovingLabel(spriteFont, "Larry Smith");
+            MovingLabel LarryArtist = new MovingLabel(spriteFont, "Character design/animation");
+            List<MovingLabel> LarryArtistList = new List<MovingLabel>();
+            LarryArtistList.Add(LarryArtistHeader);
+            LarryArtistList.Add(LarryArtist);
+            credits.Add(LarryArtistList);
+
+            MovingLabel NickMusicianHeader = new MovingLabel(spriteFont, "Nicholas Shooter");
+            MovingLabel NickMusician = new MovingLabel(spriteFont, "Composer for Ice World, Temple world, Grass world");
+            List<MovingLabel> NickMusicianList = new List<MovingLabel>();
+            NickMusicianList.Add(NickMusicianHeader);
+            NickMusicianList.Add(NickMusician);
+            credits.Add(NickMusicianList);
+
+            MovingLabel XenaMusicianHeader = new MovingLabel(spriteFont, "Xena Grant");
+            MovingLabel XenaMusician = new MovingLabel(spriteFont, "Composer for Nightmare world");
+            List<MovingLabel> XenaMusicianList = new List<MovingLabel>();
+            XenaMusicianList.Add(XenaMusicianHeader);
+            XenaMusicianList.Add(XenaMusician);
+            credits.Add(XenaMusicianList);
+
+            MovingLabel CaylenaMusicianHeader = new MovingLabel(spriteFont, "Caylen Lee");
+            MovingLabel CaylenaMusician = new MovingLabel(spriteFont, "Composer for Credits");
+            List<MovingLabel> CaylenaMusicianList = new List<MovingLabel>();
+            CaylenaMusicianList.Add(CaylenaMusicianHeader);
+            CaylenaMusicianList.Add(CaylenaMusician);
+            credits.Add(CaylenaMusicianList);
+
+            MovingLabel userTestingHeader = new MovingLabel(spriteFont, "USER TESTING:");
+            MovingLabel RobbieTest = new MovingLabel(spriteFont, "Robbie Thomas");
+            MovingLabel ChaseTest = new MovingLabel(spriteFont, "Chase Melton");
+            MovingLabel IdeanTest = new MovingLabel(spriteFont, "Idean Behforouz");
+            MovingLabel MattTest = new MovingLabel(spriteFont, "Mathew Guzdial");
+            MovingLabel ElliotTest = new MovingLabel(spriteFont, "Elliot Outland");
+            List<MovingLabel> UserTestingList = new List<MovingLabel>();
+            UserTestingList.Add(userTestingHeader);
+            UserTestingList.Add(RobbieTest);
+            UserTestingList.Add(ChaseTest);
+            UserTestingList.Add(IdeanTest);
+            UserTestingList.Add(MattTest);
+            UserTestingList.Add(ElliotTest);
+            credits.Add(UserTestingList);
+
+
+            int startingY = drawSpace.Height + 100;
+            int additionalOffsetY = 0;
+            foreach (List<MovingLabel> creditList in credits)
+            {
+                foreach (MovingLabel mention in creditList)
+                {
+                    mention.dimensions.X = 30;
+                    mention.dimensions.Y = startingY + additionalOffsetY;
+                    mention.velocity.Y = -1;
+                    additionalOffsetY += 30;
+                }
+                additionalOffsetY += 50;
+            }
+            //header.dimensions.X = 550;
+        }
+
         private void World_Change(Object sender, EventArgs eventArgs)
         {
 
@@ -273,7 +499,7 @@ private void World_Change(Object sender, EventArgs eventArgs)
             if (worldManager.curWorld != null)
             {
                 this.curWorld = worldManager.curWorld;
-                if (worldManager.curLevel == 1)
+                if (worldManager.curWorld.isTutorial)
                 {
                     WorldLabel walkUpLabel = new WorldLabel(spriteFont, "press w to walk up");
                     walkUpLabel.dimensions.X = 500;
diff --git a/DreamStateMachine/Game/Sound/Sound.cs b/DreamStateMachine/Game/Sound/Sound.cs
index 1975a30..4cbdb87 100644
--- a/DreamStateMachine/Game/Sound/Sound.cs
+++ b/DreamStateMachine/Game/Sound/Sound.cs
@@ -29,14 +29,34 @@ public void playSound()
             effect.Play();
         }
 
+        public void playLoopedSound()
+        {
+            effect.IsLooped = true;
+            effect.Play();
+        }
+
+        public void stopSound()
+        {
+            effect.Stop();
+        }
+
         public void fadeInSound(float fadeTime)
         {
+            this.playLoopedSound();
             curFadeTime = 0;
             endFadeTime = fadeTime;
             isFadingIn = true;
             effect.Volume = 0;
         }
 
+        public void fadeOutSound(float fadeTime)
+        {
+            curFadeTime = 0;
+            endFadeTime = fadeTime;
+            isFadingOut = true;
+            effect.Volume = 1;
+        }
+
         public void update(float dt)
         {
             if (isFadingIn)
diff --git a/DreamStateMachine/Game/Sound/SoundManager.cs b/DreamStateMachine/Game/Sound/SoundManager.cs
index 3c8806b..ae2924d 100644
--- a/DreamStateMachine/Game/Sound/SoundManager.cs
+++ b/DreamStateMachine/Game/Sound/SoundManager.cs
@@ -17,10 +17,13 @@ public sealed class SoundManager
         private static object syncRoot = new object();
         static Dictionary<String, Sound> soundPrototypes;
         static Dictionary<String, Song> songPrototypes;
+        private Song curSong;
+        private SongCollection songCollection;
 
         private SoundManager()
         {
-           
+            MediaPlayer.IsRepeating = false;
+            songCollection = new SongCollection();
         }
 
         public static SoundManager Instance
@@ -48,25 +51,13 @@ public void initSoundConfig(ContentManager content, String soundConfigFile, Stri
             XDocument musicDoc = XDocument.Load(musicConfigFile);
             List<XElement> songs = musicDoc.Element("Songs").Elements("Song").ToList();
             String soundClass;
-         
             SoundEffect effect;
-            String songName;
-            String songPath;
-            Song actualSong;
             foreach (XElement sound in sounds)
             {
                 soundClass = sound.Attribute("className").Value;
                 effect = content.Load<SoundEffect>(sound.Attribute("filePath").Value);
                 soundPrototypes[soundClass] = new Sound(effect);
             }
-            foreach (XElement song in songs)
-            {
-                songName = song.Attribute("name").Value;
-                songPath = song.Attribute("filePath").Value;
-                actualSong = content.Load<Song>("StainedGlassAndSpookySkeletons");
-                //actualSong = content.Load<Song>(song.Attribute("filepath").Value);
-                songPrototypes[songName] = actualSong;
-            }
         }
 
         public void playSound(String soundClass)
@@ -76,7 +67,26 @@ public void playSound(String soundClass)
 
         public void playSong(String songName)
         {
-            MediaPlayer.Play(songPrototypes[songName]);
+            soundPrototypes[songName].playLoopedSound();
+        }
+
+        public void crossFadeSongs(String firstSong, String secondSong)
+        {
+            soundPrototypes[firstSong].fadeOutSound(2);
+            soundPrototypes[secondSong].fadeInSound(5);
+        }
+
+        public void stopSong(String songName)
+        {
+            soundPrototypes[songName].stopSound();
+        }
+
+        public void stopAllSounds()
+        {
+            foreach (KeyValuePair<String, Sound> entry in soundPrototypes)
+            {
+                entry.Value.stopSound();
+            }
         }
 
         public void update(float dt)
diff --git a/DreamStateMachine/Game/World/Prop.cs b/DreamStateMachine/Game/World/Prop.cs
index 7847269..cb4f3dd 100644
--- a/DreamStateMachine/Game/World/Prop.cs
+++ b/DreamStateMachine/Game/World/Prop.cs
@@ -10,13 +10,12 @@
 
 namespace DreamStateMachine
 {
-    class Prop:ICloneable
+    class Prop:ICloneable, IDrawable
     {
         
 
-        public static event EventHandler<EventArgs> Use;
         public static event EventHandler<SpawnEventArgs> Spawn;
-        
+        public static event EventHandler<EventArgs> Remove;
 
 
         //public Attributes attributes;
@@ -27,13 +26,10 @@ class Prop:ICloneable
         public Rectangle hitBox;
         public Rectangle body;
         public String className;
+        public float rotation;
        
         public World world;
         //public Weapon activeWeapon;
-
-        
-
-
         
 
         public Prop(Texture2D tex, int width, int height, int texWidth, int texHeight)
@@ -48,21 +44,52 @@ public Prop(Texture2D tex, int width, int height, int texWidth, int texHeight)
            
         }
 
-        public Object Clone()
+        public virtual Object Clone()
         {
             Prop PropCopy = new Prop(texture, hitBox.Width, hitBox.Height, body.Width, body.Height);
             
             PropCopy.className = className;
+            PropCopy.texture = texture;
             PropCopy.color = color;
 
             return PropCopy;
         }
 
 
+        public void draw(SpriteBatch spriteBatch, Rectangle drawSpace, Texture2D debugTex, bool debugging = false)
+        {
+            Rectangle normalizedPosition;
+            Rectangle sourceRectangle;
+            Texture2D tex;
+            tex = this.getTexture();
+            normalizedPosition = new Rectangle(this.body.X - drawSpace.X,
+                                               this.body.Y - drawSpace.Y,
+                                               this.body.Width,
+                                               this.body.Height);
+
+
+            sourceRectangle = new Rectangle(this.curAnimFrame.X * this.body.Width,
+                                            this.curAnimFrame.Y * this.body.Height,
+                                            this.body.Width,
+                                            this.body.Height);
+
+            spriteBatch.Draw(
+                tex,
+                new Vector2(normalizedPosition.X + this.body.Width / 2, normalizedPosition.Y + this.body.Height / 2),
+                sourceRectangle,
+                this.color,
+                this.rotation,
+                new Vector2(normalizedPosition.Width / 2.0f, normalizedPosition.Height / 2.0f),
+                1,
+                SpriteEffects.None,
+                0
+            );
+        }
 
-
-
-
+        public bool isInDrawSpace(Rectangle drawSpace)
+        {
+            return this.hitBox.Intersects(drawSpace);
+        }
 
         public void onSpawn( Point spawnTile, int spawnType )
         {
@@ -72,7 +99,7 @@ public void onSpawn( Point spawnTile, int spawnType )
 
         public void onUse()
         {
-            Use(this, EventArgs.Empty);
+            
         }
 
         public void setAnimationFrame(int x, int y)
@@ -113,6 +140,11 @@ public Texture2D getTexture()
             return texture;
         }
 
+        public void onRemove()
+        {
+            Remove(this, EventArgs.Empty);
+        }
+
         virtual public void update(float dt)
         {
             
diff --git a/DreamStateMachine/Game/World/PropManager.cs b/DreamStateMachine/Game/World/PropManager.cs
index 29265e4..c1c5cc9 100644
--- a/DreamStateMachine/Game/World/PropManager.cs
+++ b/DreamStateMachine/Game/World/PropManager.cs
@@ -13,23 +13,43 @@ namespace DreamStateMachine.Behaviors
     class PropManager
     {
         Dictionary<String, Prop> PropPrototypes;
+        Dictionary<String, Door> DoorPrototypes;
+        Dictionary<String, Potion> PotionPrototypes;
         Random random;
 
         public PropManager()
         {
             PropPrototypes = new Dictionary<string,Prop>();
+            DoorPrototypes = new Dictionary<string,Door>();
+            PotionPrototypes = new Dictionary<string, Potion>();
             random = new Random();
+
+            WorldManager.worldChange += new EventHandler<EventArgs>(World_Change);
         }
 
         public void initPropConfig(ContentManager content, String PropConfigFile)
         {
             var doc = XDocument.Load(PropConfigFile);
             var Props = doc.Element("Props").Elements("Prop");
+            var Doors = doc.Element("Props").Elements("Door");
+            var Potions = doc.Element("Props").Elements("Potion");
+
             String PropClass;
             Texture2D PropTexture;
             int PropWidth;
             int PropHeight;
 
+            String DoorClass;
+            Texture2D DoorTexture;
+            int DoorWidth;
+            int DoorHeight;
+
+            String PotionClass;
+            Texture2D PotionTexture;
+            int PotionWidth;
+            int PotionHeight;
+            int PotionRestore;
+
             int texWidth;
             int texHeight;
             foreach (XElement Prop in Props)
@@ -45,32 +65,90 @@ public void initPropConfig(ContentManager content, String PropConfigFile)
                 this.PropPrototypes[PropClass].className = PropClass;
 
             }
+            foreach (XElement Door in Doors)
+            {
+                DoorClass = Door.Attribute("className").Value;
+                DoorTexture = content.Load<Texture2D>(Door.Attribute("texture").Value);
+                DoorWidth = int.Parse(Door.Attribute("width").Value);
+                DoorHeight = int.Parse(Door.Attribute("height").Value);
+                texWidth = int.Parse(Door.Attribute("texWidth").Value);
+                texHeight = int.Parse(Door.Attribute("texHeight").Value);
+
+                this.DoorPrototypes[DoorClass] = new Door(DoorTexture, DoorWidth, DoorHeight, texWidth, texHeight);
+                this.DoorPrototypes[DoorClass].className = DoorClass;
+            }
+            foreach (XElement Potion in Potions)
+            {
+                PotionClass = Potion.Attribute("className").Value;
+                PotionTexture = content.Load<Texture2D>(Potion.Attribute("texture").Value);
+                PotionWidth = int.Parse(Potion.Attribute("width").Value);
+                PotionHeight = int.Parse(Potion.Attribute("height").Value);
+                texWidth = int.Parse(Potion.Attribute("texWidth").Value);
+                texHeight = int.Parse(Potion.Attribute("texHeight").Value);
+                PotionRestore = int.Parse(Potion.Attribute("restore").Value);
+
+                this.PotionPrototypes[PotionClass] = new Potion(PotionTexture, 
+                                                                                            PotionWidth, PotionHeight,
+                                                                                            texWidth, texHeight, PotionRestore);
+                this.PotionPrototypes[PotionClass].className = PotionClass;
+            }
        }
 
         public void spawnProp(Prop Prop, Point spawnTile, int spawnType)
         {
-            Prop.onSpawn(spawnTile, spawnType);
+            //Prop.onSpawn(spawnTile, spawnType);
+            //Prop.world = worldManager.curWorld;
+        }
+
+        public void spawnDoor(Door door, Point spawnTile, int spawnType)
+        {
+            door.onSpawn(spawnTile, spawnType);
             //Prop.world = worldManager.curWorld;
         }
 
+        public void spawnPotion(Potion potion, Point spawnTile, int spawnType)
+        {
+            potion.onSpawn(spawnTile, spawnType);
+        }
+
         public void spawnProps(List<SpawnFlag> spawns)
         {
             foreach (SpawnFlag spawn in spawns)
             {
-                if (PropPrototypes.ContainsKey(spawn.className))
+                if (spawn.spawnType == (int)SPAWNTYPES.PROP || spawn.spawnType == (int)SPAWNTYPES.DOOR || spawn.spawnType == (int)SPAWNTYPES.POTION)
                 {
+                    if (PropPrototypes.ContainsKey(spawn.className))
+                    {
                         Prop PropToCopy = (Prop)PropPrototypes[spawn.className].Clone();
                         Point spawnTile = spawn.tilePosition;
 
                         spawnProp(PropToCopy, spawnTile, spawn.spawnType);
-                }
-                else if (spawn.className == "player_spawn")
-                {
-                    //Prop protagonist = new Prop();
+                    }
+                    else if(DoorPrototypes.ContainsKey(spawn.className))
+                    {
+                        Door DoorToCopy = (Door)DoorPrototypes[spawn.className].Clone();
+                        Point spawnTile = spawn.tilePosition;
 
+                        spawnDoor(DoorToCopy, spawnTile, spawn.spawnType);
+                    }
+                    else if (PotionPrototypes.ContainsKey(spawn.className))
+                    {
+                        Potion PotionToCopy = (Potion)PotionPrototypes[spawn.className].Clone();
+                        Point spawnTile = spawn.tilePosition;
+
+                        spawnPotion(PotionToCopy, spawnTile, spawn.spawnType);
+                    }
                 }
+            }
+        }
 
-                
+        private void World_Change(object sender, EventArgs args)
+        {
+            WorldManager worldManager = (WorldManager)sender;
+            if (worldManager.curWorld != null)
+            {
+                List<SpawnFlag> spawns = worldManager.curWorld.getSpawns();
+                spawnProps(spawns);
             }
         }
     }
diff --git a/DreamStateMachine/Game/World/Room.cs b/DreamStateMachine/Game/World/Room.cs
index cb49619..46d56a7 100644
--- a/DreamStateMachine/Game/World/Room.cs
+++ b/DreamStateMachine/Game/World/Room.cs
@@ -8,13 +8,23 @@ namespace DreamStateMachine
 {
     class Room
     {
+        public List<SpawnFlag> spawns;
+        public List<Room> children;
+        public Point hallEntrance;
+        public Point roomCenter;
         public Rectangle dimensions;
         public bool startRoom;
+        public bool isLeaf;
+        public bool isOptional;
+        public Room parent;
+        public int depth;
         //public List<Enemy> enemyList;
             
         public Room(Rectangle rect)
         {
             dimensions = rect;
+            spawns = new List<SpawnFlag>();
+            children = new List<Room>();
         }
 
         public Room(Rectangle rect, bool start)
diff --git a/DreamStateMachine/Game/World/SpawnFlag.cs b/DreamStateMachine/Game/World/SpawnFlag.cs
index ce0f944..d7a6155 100644
--- a/DreamStateMachine/Game/World/SpawnFlag.cs
+++ b/DreamStateMachine/Game/World/SpawnFlag.cs
@@ -11,6 +11,7 @@ class SpawnFlag
         public String className;
         public Point tilePosition;
         public int spawnType;
+        public bool hasKey;
 
         public SpawnFlag(String cN, Point point, int type){
             className = cN;
diff --git a/DreamStateMachine/Game/World/World.cs b/DreamStateMachine/Game/World/World.cs
index a9920cf..6dfb502 100644
--- a/DreamStateMachine/Game/World/World.cs
+++ b/DreamStateMachine/Game/World/World.cs
@@ -12,6 +12,7 @@ class World:IDrawable
     {
         List<Room> roomList;
         List<SpawnFlag> spawns;
+        List<Rectangle> usePoints;
         Point topLeftTilePos;
         Point topRightTilePos;
         Point bottomLeftTilePos;
@@ -22,6 +23,8 @@ class World:IDrawable
         int[,] tileMap;
         bool[,] collisionMap;
         public int tileSize;
+        public bool isTutorial;
+        public WorldConfig worldConfig;
 
         public World(Texture2D floorTex, int ts)
         {
diff --git a/DreamStateMachine/Game/World/WorldConfig.cs b/DreamStateMachine/Game/World/WorldConfig.cs
index 5af95ed..6fcbc8c 100644
--- a/DreamStateMachine/Game/World/WorldConfig.cs
+++ b/DreamStateMachine/Game/World/WorldConfig.cs
@@ -6,13 +6,14 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
 using System.Xml.Linq;
+using DreamStateMachine2.game.World;
 
 namespace DreamStateMachine
 {
     class WorldConfig
     {
         public String worldName;
-        public List<String> enemyClasses;
+        public List<EnemyConfig> enemyConfigs;
         public Texture2D texture;
         public int width;
         public int height;
@@ -20,10 +21,10 @@ class WorldConfig
         public String music;
 
         //Constructor
-        public WorldConfig(String worldName, List<String> enemyClasses, Texture2D worldTexture, int worldWidth, int worldHeight, int tileSize)
+        public WorldConfig(String worldName, List<EnemyConfig> enemyConfigs, Texture2D worldTexture, int worldWidth, int worldHeight, int tileSize)
         {
             this.worldName = worldName;
-            this.enemyClasses = enemyClasses;
+            this.enemyConfigs = enemyConfigs;
             this.texture = worldTexture;
             this.width = worldWidth;
             this.height = worldHeight;
diff --git a/DreamStateMachine/Game/World/WorldFactory.cs b/DreamStateMachine/Game/World/WorldFactory.cs
index 7f58dfa..79051ff 100644
--- a/DreamStateMachine/Game/World/WorldFactory.cs
+++ b/DreamStateMachine/Game/World/WorldFactory.cs
@@ -4,11 +4,15 @@
 using System.Text;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework;
+using DreamStateMachine2.game.World;
 
 namespace DreamStateMachine
 {
+    enum SPAWNTYPES { ACTOR, ENEMY, PROP, DOOR, ITEM, POTION };
+
     class WorldFactory
     {
+
         Random random;
         World newWorld;
         List<Room> rooms;
@@ -23,7 +27,7 @@ class WorldFactory
         int minHallLength = 4;
         int minRoomWidth = 4;
         int minRoomHeight = 4;
-        
+     
         //Constructor
         public WorldFactory(Random r)
         {
@@ -32,7 +36,6 @@ public WorldFactory(Random r)
             //tileMap = new int [w,h];
         }
 
-
         //Checks if the given coordinate can house a room
         //within the given constraints. (maxRoomWidth, 
         //minRoomHeight, ect.)
@@ -75,6 +78,7 @@ public bool canRoomFit(int[,] map, int xCoor, int yCoor)
                 return false;
             else if (map[yCoor + stretchTall, xCoor - stretchWide] != 0 || map[yCoor + stretchTall, xCoor + stretchWide] != 0)
                 return false;
+           
 
             //for (int i = 0; i <= minRoomWidth || i <= minRoomHeight; i++)
             //{
@@ -132,9 +136,28 @@ public bool canRoomFit(int[,] map, int xCoor, int yCoor)
             //}
 
             //Console.WriteLine("Room fits");
+
             return true;
         }
 
+        public List<Room> partitionPastRoom(List<Room> rooms, Room lockedBranch)
+        {
+            rooms.Remove(lockedBranch);
+            if (lockedBranch.children.Count > 0)
+            {
+                foreach (Room child in lockedBranch.children)
+                {
+                    rooms = partitionPastRoom(rooms, child);
+                }
+                return rooms;
+            }else
+            { 
+                return rooms;
+            }
+
+        }
+
+
         //Finds an acceptable x,y position to house a room in the given tilemap.
         //Uses canRoomFit
         //Returns array of x,y coordinates of the new room site
@@ -267,21 +290,35 @@ public int[] chooseHallSite(int[,] map, Rectangle dimensions, bool force = false
         //Generates an World object with the given bounds using constraints outlined
         //at the top of the class.
         //Returns an array of enumerated tiles.
-        public World generateWorld(WorldConfig worldConfig, int numEnemies)
+        public World generateWorld(WorldConfig worldConfig, int difficulty)
         {
-            World world = generateWorld(worldConfig.texture, worldConfig.enemyClasses, worldConfig.width, worldConfig.height, worldConfig.tileSize, numEnemies);
+            World world = generateWorld(worldConfig.texture, worldConfig.enemyConfigs, worldConfig.tileSize, difficulty);
             world.themeMusic = worldConfig.music;
+            world.worldConfig = worldConfig;
             return world;
         }
 
-        public World generateWorld(Texture2D floorTex, List<String> enemyClasses, int width, int height, int tileSize, int numEnemies)
+        public World generateWorld(Texture2D floorTex, List<EnemyConfig> enemyConfigs, int tileSize, int difficulty)
         {
             rooms = new List<Room>();
             spawns = new List<SpawnFlag>();
+            int enemyDifficultyCap = difficulty /5;
+            List<EnemyConfig> availableEnemies = enemyConfigs.FindAll(x => x.difficulty <= difficulty );
+            List<EnemyConfig> chosenEnemies = new List<EnemyConfig>();
+            while (enemyDifficultyCap > 0 && availableEnemies.Count > 0)
+            {
+                EnemyConfig choosenEnemy = availableEnemies[random.Next(0,availableEnemies.Count)];
+                chosenEnemies.Add(choosenEnemy);
+                enemyDifficultyCap -= choosenEnemy.difficulty;
+                availableEnemies = enemyConfigs.FindAll(x => x.difficulty <= difficulty );
+            }
+            maxRooms = (int)(difficulty / 5) + 3;
+            int width = (maxRooms * maxRoomWidth * 2) + (maxRooms * maxHallLength);
+            int height = (maxRooms * maxRoomHeight * 2) + (maxRooms * maxHallLength);
             newWorld = new World(floorTex, tileSize);
             tileMap = new int[height, width];
             collisionMap = new bool[height, width];
-            remainingEnemies = numEnemies;
+            //remainingEnemies = numEnemies;
 
             for (int i = 0; i < tileMap.GetLength(0); i++)
             {
@@ -299,9 +336,11 @@ public World generateWorld(Texture2D floorTex, List<String> enemyClasses, int wi
             Point coors = chooseRoomSite(tileMap, validWorldSpace);
             Room firstRoom = placeRoom(tileMap, collisionMap, coors.X, coors.Y);
             firstRoom.startRoom = true;
+            firstRoom.isOptional = false;
+            firstRoom.depth = 0;
 
             Point spawnPos = new Point(coors.X, coors.Y);
-            SpawnFlag playerSpawn = new SpawnFlag("player", spawnPos, 1);
+            SpawnFlag playerSpawn = new SpawnFlag("player", spawnPos, (int)SPAWNTYPES.ACTOR);
             spawns.Add(playerSpawn);
             newWorld.setSpawnTile(spawnPos);
             tileMap[coors.Y, coors.X] = 14;
@@ -339,12 +378,25 @@ public World generateWorld(Texture2D floorTex, List<String> enemyClasses, int wi
                     if (random.Next(0, 4) == 0)
                     {
                         Room splitRoom = placeRoom(tileMap, collisionMap, hallCoors[4], hallCoors[5]);
+                        splitRoom.hallEntrance = new Point(hallCoors[0], hallCoors[1]);
+                        splitRoom.parent = curRoom;
+                        curRoom.children.Add(splitRoom);
+                        splitRoom.depth = splitRoom.parent.depth + 1;
+                        splitRoom.isOptional = true;
                         rooms.Add(splitRoom);
                     }
                     else
                     {
+                        Room tempRoom = curRoom;
                         curRoom = placeRoom(tileMap, collisionMap, hallCoors[4], hallCoors[5]);
+                        curRoom.hallEntrance = new Point(hallCoors[0], hallCoors[1]);
+                        curRoom.roomCenter = new Point(hallCoors[0], hallCoors[1]);
+                        curRoom.parent = tempRoom;
+                        tempRoom.children.Add(curRoom);
+                        curRoom.depth = curRoom.parent.depth + 1;
+                        curRoom.isOptional = true;
                         rooms.Add(curRoom);
+                        //curRoom.parentRoom = rooms.ElementAt(roomIndex);
                     }
                     
                     placeHall(tileMap, collisionMap, hallCoors[0], hallCoors[1], hallCoors[2], hallCoors[3]);
@@ -353,22 +405,64 @@ public World generateWorld(Texture2D floorTex, List<String> enemyClasses, int wi
                 }
             }
 
-            Room room;
-            String enemyClass;
-            for (int i = 0; i < rooms.Count; i++)
+            Room room = rooms.ElementAt(rooms.Count - 1);
+            tileMap[room.dimensions.Y + room.dimensions.Height / 2, room.dimensions.X + room.dimensions.Width / 2] = 15;
+            room.isLeaf = true;
+            room = room.parent;
+            while (room.parent != null)
             {
-                room = rooms.ElementAt(i);
-                if (i != 0)
+                room.isOptional = false;
+                room.isLeaf = true;
+                room = room.parent;
+            }
+            
+            foreach(EnemyConfig tempConfig in chosenEnemies){
+                room = rooms.ElementAt(random.Next(1,rooms.Count - 2));
+                placeEnemy(collisionMap, room, spawns, tempConfig.enemyClass);
+            }
+
+
+            List<Room> possibleLockedRooms = rooms.FindAll(x => !x.isOptional && !x.startRoom && x.depth > 1);
+
+            if (possibleLockedRooms.Count > 0)
+            {
+                Room lockedRoom = possibleLockedRooms[random.Next(0, possibleLockedRooms.Count - 1)];
+                //tileMap[lockedRoom.hallEntrance.Y, lockedRoom.hallEntrance.X] = 15;
+                SpawnFlag lockedDoorFlag = new SpawnFlag("Generic_Door", lockedRoom.hallEntrance, (int)SPAWNTYPES.DOOR);
+                spawns.Add(lockedDoorFlag);
+                List<Room> possibleKeyRooms = new List<Room>(rooms);
+                possibleKeyRooms = partitionPastRoom(possibleKeyRooms, lockedRoom);
+                Room keyRoom;
+                if (possibleKeyRooms.FindAll(x => x.isLeaf).Count > 0)
+                {
+                    List<Room> keyRooms = possibleKeyRooms.FindAll(x => x.isLeaf);
+                    keyRoom = keyRooms[random.Next(0, keyRooms.Count - 1)];
+                }
+                else
                 {
-                    enemyClass = enemyClasses[random.Next(0,enemyClasses.Count)];
-                    placeEnemy(collisionMap, room, spawns, enemyClass);
+                    keyRoom = possibleKeyRooms[random.Next(0, possibleKeyRooms.Count - 1)];
                 }
-                if (i == rooms.Count - 1)
+
+                if (keyRoom.spawns.Count > 0)
                 {
-                    tileMap[room.dimensions.Y + room.dimensions.Height / 2, room.dimensions.X + room.dimensions.Width / 2] = 15;
+                    SpawnFlag tempEnemyConfig = keyRoom.spawns[random.Next(0, keyRoom.spawns.Count - 1)];
+                    tempEnemyConfig.hasKey = true;
+                }
+                else
+                {
+                    placeKey(collisionMap, keyRoom);
                 }
             }
 
+            List<Room> possiblePotionRooms = rooms.FindAll(x => !x.isOptional && !x.startRoom && x.depth > 1);
+
+            if (possiblePotionRooms.Count > 0)
+            {
+                Room potionRoom = possiblePotionRooms[random.Next(0, possiblePotionRooms.Count - 1)];
+                SpawnFlag potionFlag = new SpawnFlag("Weak_Potion", potionRoom.roomCenter, (int)SPAWNTYPES.DOOR);
+                spawns.Add(potionFlag);
+            }
+
             //Set room list here
             newWorld.setTileMap(tileMap, collisionMap);
             newWorld.setSpawns(spawns);
@@ -395,8 +489,33 @@ public void placeEnemy(bool[,] cMap, Room room, List<SpawnFlag> spawns, String e
                 }
             }
 
-            SpawnFlag spawnFlag = new SpawnFlag(enemyType, coors, 2);
+            SpawnFlag spawnFlag = new SpawnFlag(enemyType, coors, (int)SPAWNTYPES.ENEMY);
+            spawns.Add(spawnFlag);
+            room.spawns.Add(spawnFlag);
+        }
+
+        public void placeKey(bool[,] cMap, Room room)
+        {
+            Rectangle dimensions = room.dimensions;
+            Point coors;
+
+            coors.X = (int)random.Next(dimensions.X + 1, dimensions.X + dimensions.Width - 2);
+            coors.Y = (int)random.Next(dimensions.Y + 1, dimensions.Y + dimensions.Height - 2);
+
+            SpawnFlag curSpawn;
+            for (int i = 0; i < spawns.Count; i++)
+            {
+                curSpawn = spawns[0];
+                if (curSpawn.tilePosition.X == coors.X && curSpawn.tilePosition.Y == coors.Y)
+                {
+                    coors.X = (int)random.Next(dimensions.X + 1, dimensions.X + dimensions.Width - 2);
+                    coors.Y = (int)random.Next(dimensions.Y + 1, dimensions.Y + dimensions.Height - 2);
+                }
+            }
+
+            SpawnFlag spawnFlag = new SpawnFlag("key", coors, (int)SPAWNTYPES.ITEM);
             spawns.Add(spawnFlag);
+            room.spawns.Add(spawnFlag);
         }
 
         //Places a hall in the given tilemap with given x,y coordinates, direction and length.
diff --git a/DreamStateMachine/Game/World/WorldManager.cs b/DreamStateMachine/Game/World/WorldManager.cs
index 45ee49f..1c107fb 100644
--- a/DreamStateMachine/Game/World/WorldManager.cs
+++ b/DreamStateMachine/Game/World/WorldManager.cs
@@ -7,6 +7,8 @@
 using Microsoft.Xna.Framework.Content;
 using System.Xml.Linq;
 using DreamStateMachine;
+using Microsoft.Xna.Framework.Media;
+using DreamStateMachine2.game.World;
 
 namespace DreamStateMachine
 {
@@ -57,20 +59,16 @@ private void Actor_Use(object sender, EventArgs e)
                 int[,] tileMap = this.curWorld.getTileMap();
                 if (tileMap[usePoint.Y, usePoint.X] == 15)
                 {
-                    //worldManager.curWorld.useTileAtPoint(usePoint);
-                    //Console.Write(worldManager.curLevel);
-                    if (this.getWorldChild(0) == null)
+                    if (this.getWorldChild(0) == null && !curWorld.isTutorial)
                     {
                         playerTransfer = usingActor;
                         this.createNextWorld(0);
                         onWorldChange();
-                        playerTransfer = null;
-
-                        //this.spawnActor(protagonist, worldManager.curWorld.getSpawnPos(), 1);
-                        //this.spawnActors(worldManager.curWorld.getSpawns());
                     }
-                    //isLoadingWorld = false;
-                    //Console.Write(worldManager.curLevel);
+                    else if (curWorld.isTutorial)
+                    {
+                        onWorldChange();
+                    }
                 }
             }
         }
@@ -82,7 +80,8 @@ public void initWorldConfig(ContentManager content, String actorConfigFile)
             List<XElement> enemies;
 
             String worldName;
-            List<String> enemyClasses;
+            List<EnemyConfig> enemyConfigs;
+            EnemyConfig enemyConfig;
             Texture2D texture;
             int width;
             int height;
@@ -96,12 +95,13 @@ public void initWorldConfig(ContentManager content, String actorConfigFile)
                 width = int.Parse(world.Attribute("width").Value);
                 height = int.Parse(world.Attribute("height").Value);
                 tileSize = int.Parse(world.Attribute("tileSize").Value);
-                enemyClasses = new List<String>();
+                enemyConfigs = new List<EnemyConfig>();
                 foreach (XElement enemy in enemies)
                 {
-                    enemyClasses.Add(enemy.Attribute("class").Value);
+                    enemyConfig = new EnemyConfig(enemy.Attribute("class").Value, int.Parse(enemy.Attribute("difficulty").Value));
+                    enemyConfigs.Add(enemyConfig);
                 }
-                worldPrototypes[worldName] = new WorldConfig(worldName, enemyClasses, texture, width, height, tileSize);
+                worldPrototypes[worldName] = new WorldConfig(worldName, enemyConfigs, texture, width, height, tileSize);
                 worldPrototypes[worldName].music = world.Attribute("themeMusic").Value;
             }
         }
@@ -109,12 +109,23 @@ public void initWorldConfig(ContentManager content, String actorConfigFile)
         public void initStartingWorld()
         {
             curLevel = 1;
-            //curWorld = this.worldFactory.generateWorld(worldPrototypes["forest"], 5);
+            curWorld = this.worldFactory.generateWorld(worldPrototypes["forest"], 5);
+            Node<World> rootWorld = new Node<World>(curWorld);
+            curWorldNode = rootWorld;
+            worldTree.setRoot(rootWorld);
+            SoundManager.Instance.playSong(curWorld.themeMusic);
+            onWorldChange();
+        }
+
+        public void initTutorial()
+        {
+            curLevel = 1;
             curWorld = loadTutorialLevel();
+            curWorld.isTutorial = true;
             Node<World> rootWorld = new Node<World>(curWorld);
             curWorldNode = rootWorld;
-            //Node<World> newWorldNode = Node<World>(curWorld);
             worldTree.setRoot(rootWorld);
+            SoundManager.Instance.playSong(curWorld.themeMusic);
             onWorldChange();
         }
 
@@ -140,12 +151,27 @@ public World getWorldChild(int worldIndex)
 
         public World createNextWorld(int worldIndex)
         {
-            World tempWorld = this.worldFactory.generateWorld(worldPrototypes["nightmare"], 5);
+            World prevWorld = curWorld;
+            curLevel++;
+            int difficulty = (int)((5 * Math.Log(curLevel) * curLevel)+ 5* Math.Sin(3*curLevel/2) + 5);
+            World tempWorld;
+            if (curLevel % 5 == 0)
+            {
+               List<WorldConfig> worldConfigs = worldPrototypes.Values.ToList();
+               worldConfigs.Remove(prevWorld.worldConfig);
+               tempWorld = this.worldFactory.generateWorld(worldConfigs[random.Next(0, worldConfigs.Count)], difficulty);
+            }else{
+                tempWorld = this.worldFactory.generateWorld(prevWorld.worldConfig, difficulty);
+            }
             Node<World> tempNode = new Node<World>(tempWorld);
             curWorldNode.Children.Insert(worldIndex, tempNode);
             curWorldNode = curWorldNode.Children[worldIndex];
             curWorld = curWorldNode.Value;
-            curLevel++;
+            
+            if (curWorld.themeMusic != prevWorld.themeMusic)
+            {
+                SoundManager.Instance.crossFadeSongs(prevWorld.themeMusic, curWorld.themeMusic);
+            }
             return tempWorld;
         }
 
@@ -153,25 +179,6 @@ private void onWorldChange(){
             worldChange(this, EventArgs.Empty);
         }
 
-
-        //public World loadFromCustom(int[,] tileMap, bool[,] collisionMap)
-        //{
-        //    Point playerSpawnPos = new Point(1, 1);
-        //    return this.loadFromCustom(worldPrototypes["tundra"], tileMap, collisionMap, playerSpawnPos);
-        //}
-
-        //public World loadFromCustom(WorldConfig worldConfig, int[,] tileMap, bool[,] collisionMap, Point playerSpawnPos)
-        //{
-        //    return this.loadFromCustom(worldConfig.texture, worldConfig.tileSize, tileMap, collisionMap, playerSpawnPos);
-        //}
-
-        //public World loadFromCustom(Texture2D tile, int tileSize, int[,] tileMap, bool[,] collisionMap, Point playerSpawnPos)
-        //{
-        //    List<String> enemyTypeList = new List<String>();
-        //    List<Point> enemySpawnPosList = new List<Point>();
-        //    return this.loadFromCustom(tile, tileSize, tileMap, collisionMap, playerSpawnPos, enemyTypeList, enemySpawnPosList);
-        //}
-
         public World loadFromCustom(WorldConfig worldConfig, int[,] tileMap, bool[,] collisionMap, Point playerSpawnPos, List<String> enemyTypeList, List<Point> enemySpawnPosList)
         {
             return this.loadFromCustom(worldConfig.texture, worldConfig.tileSize, tileMap, collisionMap, playerSpawnPos, enemyTypeList, enemySpawnPosList);
@@ -195,6 +202,7 @@ public World loadFromCustom(Texture2D tile, int tileSize, int[,] tileMap, bool[,
                 }
             }
             tempWorld.setSpawns(spawns);
+            tempWorld.themeMusic = "forestTheme";
             return tempWorld;
 
         }
diff --git a/DreamStateMachine/game.cs b/DreamStateMachine/game.cs
index 3103cf2..f174327 100644
--- a/DreamStateMachine/game.cs
+++ b/DreamStateMachine/game.cs
@@ -28,6 +28,7 @@ public class Game1 : Microsoft.Xna.Framework.Game
         AIController aiController;
         ItemManager itemManager;
         PhysicsController physicsController;
+        PropManager propManager;
         WorldManager worldManager;
 
         Actor player;
@@ -38,17 +39,9 @@ public class Game1 : Microsoft.Xna.Framework.Game
         Point origin;
         Camera cam;
         SpriteBatch spriteBatch;
-        SpriteFont arielBlackFont;
-        Texture2D debugSquare;
-        Texture2D healthBar;
-        Texture2D whiteSquare;
-        Texture2D splashScreen;
         
         InputHandler inputHandler;
 
-        bool isLoadingWorld;
-        //bool usingGamePad = false;
-
         
 
 
@@ -135,8 +128,15 @@ protected override void LoadContent()
             itemManager = new ItemManager();
             itemManager.initWeaponConfig(Content, "Content/Weapons.xml");
 
+            propManager = new PropManager();
+            propManager.initPropConfig(Content, "Content/Props.xml");
+
             cam.enterStartMenu();
             cam.NewGame += new EventHandler<EventArgs>(NewGameSelected);
+            cam.Tutorial += new EventHandler<EventArgs>(TutorialSelected);
+            cam.Credits += new EventHandler<EventArgs>(CreditsSelected);
+            cam.CreditsExit += new EventHandler<EventArgs>(CreditsExited);
+            WorldManager.worldChange += new EventHandler<EventArgs>(WorldManager_worldChange);
 
         }
 
@@ -173,7 +173,11 @@ protected override void Draw(GameTime gameTime)
         public void startNewGame()
         {
             worldManager.initStartingWorld();
-            SoundManager.Instance.playSong("templeTheme");
+        }
+
+        public void startTutorial()
+        {
+            worldManager.initTutorial();
         }
 
         public void MainGameUpdate(GameTime gameTime)
@@ -189,23 +193,23 @@ public void MainGameUpdate(GameTime gameTime)
             base.Update(gameTime);
         }
 
-        public void LoadWorldUpdate(GameTime gameTime)
-        {
-            while (isLoadingWorld)
-            {
-                float dt = (gameTime.ElapsedGameTime.Seconds) + (gameTime.ElapsedGameTime.Milliseconds / 1000f);
-                //UpdateInput();
-                //actorManager.update(dt);
-                //UpdateCamera(cam, player);
+        //public void LoadWorldUpdate(GameTime gameTime)
+        //{
+        //    while (isLoadingWorld)
+        //    {
+        //        float dt = (gameTime.ElapsedGameTime.Seconds) + (gameTime.ElapsedGameTime.Milliseconds / 1000f);
+        //        //UpdateInput();
+        //        //actorManager.update(dt);
+        //        //UpdateCamera(cam, player);
 
-                base.Update(gameTime);
-            }
-            gameUpdateStack.Pop();
-            gameDrawStack.Pop();
+        //        base.Update(gameTime);
+        //    }
+        //    gameUpdateStack.Pop();
+        //    gameDrawStack.Pop();
 
-            //gameUpdate = MainGameUpdate;
-            //gameDraw = MainGameDraw;
-        }
+        //    //gameUpdate = MainGameUpdate;
+        //    //gameDraw = MainGameDraw;
+        //}
 
         public void StartMenuUpdate(GameTime gameTime)
         {
@@ -214,6 +218,13 @@ public void StartMenuUpdate(GameTime gameTime)
             UpdateInput();
         }
 
+        public void CreditsUpdate(GameTime gameTime)
+        {
+            float dt = (gameTime.ElapsedGameTime.Seconds) + (gameTime.ElapsedGameTime.Milliseconds / 1000f);
+            cam.creditsUpdate(dt);
+            UpdateInput();
+        }
+
         private void UpdateInput()
         {
             
@@ -232,7 +243,7 @@ private void UpdateInput()
                 foreach (Command c in commands)
                     c.Execute(cam.rootGUIElement);
             }
-            else if(cam.menuEnabled && cam.rootGUIElement != null)
+            else if ((cam.creditsEnabled || cam.menuEnabled) && cam.rootGUIElement != null)
             {
                 cam.handleGuiControls();
             }
@@ -255,6 +266,7 @@ public void MainGameDraw(GameTime gameTime)
             spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.NonPremultiplied, SamplerState.AnisotropicClamp, DepthStencilState.Default, RasterizerState.CullCounterClockwise);
                 cam.drawFloor();
                 cam.drawActors();
+                cam.drawProps();
                 cam.drawGUI();
             spriteBatch.End();
 
@@ -262,27 +274,40 @@ public void MainGameDraw(GameTime gameTime)
 
         }
 
-        public void LoadWorldDraw(GameTime gameTime)
+        public void CreditsDraw(GameTime gameTime)
         {
 
             GraphicsDevice.Clear(Color.Black);
 
-            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.AnisotropicClamp, DepthStencilState.Default, RasterizerState.CullNone);
-            // Draw Hello World
-            string output = "Loading World";
-
-            // Find the center of the string
-            Vector2 FontOrigin = arielBlackFont.MeasureString(output) / 2;
-            Vector2 screenorigin = new Vector2(graphics.PreferredBackBufferWidth / 2, graphics.PreferredBackBufferHeight / 2);
-            // Draw the string
-            spriteBatch.DrawString(arielBlackFont, output, screenorigin, Color.White,
-                0, FontOrigin, 1.0f, SpriteEffects.None, 0.5f);
+            spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.NonPremultiplied, SamplerState.AnisotropicClamp, DepthStencilState.Default, RasterizerState.CullCounterClockwise);
+                cam.drawCredits();
             spriteBatch.End();
 
             base.Draw(gameTime);
 
         }
 
+        //public void LoadWorldDraw(GameTime gameTime)
+        //{
+
+        //    GraphicsDevice.Clear(Color.Black);
+
+        //    spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.AnisotropicClamp, DepthStencilState.Default, RasterizerState.CullNone);
+        //    // Draw Hello World
+        //    string output = "Loading World";
+
+        //    // Find the center of the string
+        //    Vector2 FontOrigin = arielBlackFont.MeasureString(output) / 2;
+        //    Vector2 screenorigin = new Vector2(graphics.PreferredBackBufferWidth / 2, graphics.PreferredBackBufferHeight / 2);
+        //    // Draw the string
+        //    spriteBatch.DrawString(arielBlackFont, output, screenorigin, Color.White,
+        //        0, FontOrigin, 1.0f, SpriteEffects.None, 0.5f);
+        //    spriteBatch.End();
+
+        //    base.Draw(gameTime);
+
+        //}
+
         public void LoadNextWorld()
         {
 
@@ -293,6 +318,7 @@ public void NewGameSelected(Object sender, EventArgs eventArgs)
             //Console.Write("new game selected");
             cam.menuEnabled = false;
             startNewGame();
+            //SoundManager.Instance.stopAllSounds();
 
             gameUpdateStack.Push(MainGameUpdate);
             gameDrawStack.Push(MainGameDraw);
@@ -300,6 +326,43 @@ public void NewGameSelected(Object sender, EventArgs eventArgs)
             gameDraw = gameDrawStack.Peek();
         }
 
+        public void TutorialSelected(Object sender, EventArgs eventArgs)
+        {
+            cam.menuEnabled = false;
+            startTutorial();
+
+            gameUpdateStack.Push(MainGameUpdate);
+            gameDrawStack.Push(MainGameDraw);
+            gameUpdate = gameUpdateStack.Peek();
+            gameDraw = gameDrawStack.Peek();
+        }
+
+        public void CreditsSelected(Object sender, EventArgs eventArgs)
+        {
+            cam.menuEnabled = false;
+            cam.creditsEnabled = true;
+            cam.rollCredits();
+            gameUpdateStack.Push(CreditsUpdate);
+            gameDrawStack.Push(CreditsDraw);
+            gameUpdate = gameUpdateStack.Peek();
+            gameDraw = gameDrawStack.Peek();
+            SoundManager.Instance.playSong("creditsTheme");
+        }
+
+        public void CreditsExited(Object sender, EventArgs eventArgs)
+        {
+            cam.creditsEnabled = false;
+            SoundManager.Instance.stopAllSounds();
+            cam.enterStartMenu();
+            cam.drawSpace.X = 0;
+            cam.drawSpace.Y = 0;
+            gameUpdateStack.Pop();
+            gameDrawStack.Pop();
+            gameUpdate = gameUpdateStack.Peek();
+            gameDraw = gameDrawStack.Peek();
+            SoundManager.Instance.stopSong("creditsTheme");
+        }
+
         private void Actor_Spawn(Object sender, EventArgs eventArgs)
         {
             Actor actor = (Actor)sender;
@@ -313,7 +376,27 @@ private void Actor_Use(Object sender, EventArgs eventArgs)
             if (deadActor.className == "player" && deadActor.health <= 0 && gameUpdateStack.Count > 1)
             {
                 player = null;
-                
+                SoundManager.Instance.stopAllSounds();
+
+                cam.enterStartMenu();
+                cam.drawSpace.X = 0;
+                cam.drawSpace.Y = 0;
+                worldManager.restart();
+                gameUpdateStack.Pop();
+                gameDrawStack.Pop();
+                gameUpdate = gameUpdateStack.Peek();
+                gameDraw = gameDrawStack.Peek();
+            }
+        }
+
+        private void WorldManager_worldChange(Object sender, EventArgs eventArgs)
+        {
+            WorldManager worldManager = (WorldManager)sender;
+            if (worldManager.curWorld != null && worldManager.curWorld.isTutorial && gameUpdateStack.Count > 1)
+            {
+                player = null;
+                SoundManager.Instance.stopAllSounds();
+
                 cam.enterStartMenu();
                 cam.drawSpace.X = 0;
                 cam.drawSpace.Y = 0;