Changeset 3649

Timestamp:

2012-07-06 11:53:40 (11 years ago)

Author:

dezhidki

Message:

Talletus.

Location:

2012/27/DenisZ/TheDungeonGame/TheDungeonGame

Files:

• TheDungeonGame/EntityTemplates.cs (modified) (1 diff)
• TheDungeonGame/InGameGui.cs (modified) (2 diffs)
• TheDungeonGame/Player.cs (modified) (1 diff)
• TheDungeonGame/TheDungeonGame.cs (modified) (3 diffs)
• TheDungeonGameContent/TheDungeonGameContent.contentproj (modified) (1 diff)

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/EntityTemplates.cs

@@ -340 +340 @@
                 turtle.Hit(RandomGen.NextVector(-300, 300));
                 turtle.Collided += turtleCollided;
+                turtle.Tag = "Turtle";
                 game.Add(turtle, 3);
             }

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/InGameGui.cs

@@ -97 +97 @@
             healthAmount.TextColor = Color.Red;
             healthAmount.TextScale = new Vector(1.5, 1.5);
-            healthAmount.Right = Right - 100;
+            healthAmount.Right = Right - 30;
 
             Add(healthAmount);
@@ -145 +145 @@
             bossMeterBar.BarColor = Color.Green;
             bossMeterBar.BorderColor = Color.White;
-            bossMeterBar.Right -= 40;
+            bossMeterBar.Right -= 150;
             bossMeterBar.BindTo(bossHealth);
             Add(bossMeterBar);

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/Player.cs

@@ -144 +144 @@
             else if (targetObject.Tag.Equals("Wall") || targetObject.Tag.Equals("ObjectRock") || targetObject.Tag.Equals("Item"))
                 collidingObject.Destroy();
+            else if (targetObject.Tag.Equals("Turtle"))
+            {
+                targetObject.Destroy();
+                collidingObject.Destroy();
+            }
         }
 

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/TheDungeonGame.cs

@@ -32 +32 @@
     public List<Image> objectTextures = new List<Image>();
     public static List<SoundEffect> soundEffects = new List<SoundEffect>();
+    public Image menuBg = LoadImage("background/menu");
     public InGameGui gui;
     public static MediaPlayer soundPlayer;
@@ -45 +46 @@
     private void showMainMenu()
     {
+        Level.Background.Image = menuBg;
         MultiSelectWindow menu = new MultiSelectWindow("Welcome to: \nThe Dungeon Game!",new string[]{"Play!", "Exit"});
         menu.AddItemHandler(0, initGame);
@@ -53 +55 @@
     private void initGame()
     {
+        Level.Background.Image = null;
         Level.Width = ROOMWIDTH * 20;
         Level.Height = ROOMHEIGHT * 20;

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGameContent/TheDungeonGameContent.contentproj

@@ -322 +322 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="background\menu.png">
+      <Name>menu</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </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.