Changeset 4484 for 2013/27

Timestamp:

2013-07-05 12:29:41 (7 years ago)

Author:

jumakall

Message:

 

Location:

2013/27/TeemuM

Files:

• Game/Game/Game/AudioPlayer.cs (modified) (1 diff)
• Game/Game/Game/Game.cs (modified) (4 diffs)
• Game/Game/Game/Game.csproj.Debug.cachefile (modified) (4 diffs)
• Game/Game/Game/Player.cs (modified) (3 diffs)
• Game/Game/GameContent/GameContent.contentproj (modified) (2 diffs)
• Game/Game/GameContent/GameOver.png (modified) (previous)
• RAW (added)
• RAW/GameOver.xcf (added)

2013/27/TeemuM/Game/Game/Game/AudioPlayer.cs

@@ -46 +46 @@
                 tick.Start();
                 Player(types[i], max[i]);
+                return true;
+            }
+
+        return false;
+    }
+
+    public bool PlayEffect(String type)
+    {
+        for (int i = 0; i < types.Count; i++)
+            if (types[i].ToLower() == type.ToLower())
+            {
+                Game.LoadSoundEffect(type + RandomGen.NextInt(0, max[i])).Play();
                 return true;
             }

2013/27/TeemuM/Game/Game/Game/Game.cs

@@ -16 +16 @@
         audio.RegisterType("Background", 4);
         audio.RegisterType("Enemyspawn", 0);
-        audio.RegisterType("GameOver", 0);
+        audio.RegisterType("GameOverSound", 0);
         audio.RegisterType("MenuMusic", 0);
         audio.RegisterType("RandomSound", 0);
@@ -260 +260 @@
     {
         ClearAll();
-        MessageDisplay.Add("Saved!");
         MainMenu();
     }
@@ -322 +321 @@
     private void GameOver()
     {
+        ClearControls();
+        audio.Play("GameOverSound", true);
         GameObject layer = new GameObject(Game.Screen.Width + 100, Game.Screen.Height + 100);
         layer.Color = Color.Transparent;
@@ -328 +329 @@
         layer.FadeColorTo(Color.Lerp(Color.Transparent, Color.Black, 0.8), 1.0);
 
-        Label t = new Label("Game over");
-        t.Position = player.Position;
-        t.TextColor = Color.White;
-        Add(t, 1);
+        GameObject txt = new GameObject(987, 248);
+        txt.Position = player.Position;
+        txt.Image = LoadImage("GameOverImage");
+        Add(txt, 1);
+
+        PushButton r = new PushButton("Play again");
+        r.X = player.X;
+        r.Y = player.Y - Screen.Height / 4;
+        r.Clicked += delegate() { ClearAll(); MainMenu(); };
+        Add(r, 1);
 
         Timer.SingleShot(1, delegate { IsPaused = true; });

2013/27/TeemuM/Game/Game/Game/Game.csproj.Debug.cachefile

@@ -10 +10 @@
 Content\Background4.xnb
 Content\Enemyspawn0.xnb
-Content\GameOver0.xnb
 Content\MenuMusic0.xnb
 Content\Randomsound0.xnb
@@ -19 +18 @@
 Content\transparent.xnb
 Content\EasterEgg.xnb
+Content\transparent.xnb
+Content\GameOverSound0.xnb
+Content\GameOverImage.xnb
 Content\Background0.wma
 Content\Background1.wma
@@ -25 +27 @@
 Content\Background4.wma
 Content\Enemyspawn0.wma
-Content\GameOver0.wma
 Content\MenuMusic0.wma
 Content\Randomsound0.wma
@@ -33 +34 @@
 Content\Zombiesound2.wma
 Content\EasterEgg.wma
+Content\GameOverSound0.wma

2013/27/TeemuM/Game/Game/Game/Player.cs

@@ -72 +72 @@
         Explosion explosion = new Explosion(50);
         explosion.Position = pos;
+        explosion.Force = 0;
         game.Add(explosion);
     }
@@ -79 +80 @@
         if (target is Enemy)
         {
-            Explosion(target.Position);
             if (weapon is Cannon)
                 ((Enemy)target).Health(-cannonDamage);
@@ -88 +88 @@
             else if (weapon is AssaultRifle)
                 ((Enemy)target).Health(-AssaultRifleDamage);
+            Explosion(target.Position);
         }
         projectile.Destroy();

2013/27/TeemuM/Game/Game/GameContent/GameContent.contentproj

@@ -106 +106 @@
     </Compile>
     <Compile Include="GameOver0.mp3">
-      <Name>GameOver0</Name>
+      <Name>GameOverSound0</Name>
       <Importer>Mp3Importer</Importer>
       <Processor>SongProcessor</Processor>
@@ -153 +153 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GameOver.png">
+      <Name>GameOverImage</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.