Changeset 4446

Timestamp:

2013-07-04 15:34:20 (10 years ago)

Author:

jumakall

Message:

 

Location:

2013/27/TeemuM/Game/Game/Game

Files:

• AudioPlayer.cs (added)
• Game.cs (modified) (4 diffs)
• Game.csproj (modified) (2 diffs)
• Player.cs (modified) (1 diff)

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

@@ -29 +29 @@
         menu.AddItemHandler(2, PerkMenu);
         menu.AddItemHandler(3, Exit);
-        MediaPlayer.Play("MenuMusic");
         Add(menu);
 
@@ -66 +65 @@
                     Score(int.Parse(commands[2]));
                 }
-            }
-            else if (commands[0] == "tenthleveltaurenchieftain")
-            {
-                MediaPlayer.Play("SpesialEasterEgg");
             }
             else if (commands[0] == "level")
@@ -142 +137 @@
             else if (commands[0] == "die")
             {
-                UI.GameOver();
-            }
-            else if (commands[0] == "player")
-            {
-                if (commands[1] == "stop")
-                {
-                    MediaPlayer.Stop();
-                }
+                // UI.GameOver();
             }
             else if (commands[0] == "exit")
             {
                 Exit();
+            }
+            else if (commands[0] == "maintenance")
+            {
+                int c = 0;
+                for (int i = 0; i < enemies.Count; i++)
+                {
+                    if (enemies[i].IsDestroyed)
+                    {
+                        enemies.RemoveAt(i);
+                        i--;
+                    }
+                }
+
+                MessageDisplay.Add(c + " entities removed");
             }
             else { MessageDisplay.Add("Unknow command!"); }
@@ -168 +170 @@
         Keyboard.Listen(Key.Tab, ButtonState.Pressed, DeveloperCommand, null);
 
-        MediaPlayer.Stop();
-        Timer mPlayer = new Timer();
-        mPlayer.Interval = 3;
-        mPlayer.Timeout += BackgroundMusicPlayer;
-        mPlayer.Start();
+        player = new Player(50, 50, 10, true);
+        Add(player);
+        Camera.Follow(player);
 
         AddScoreMeter();
-
-        Image background = LoadImage("Background");
-        Level.Background.Image = background;
-
-        player = new Player(50, 50, 10, true);
-        Camera.Follow(player);
-        Add(player);
-        SpawnZombie();
         CreateLifeMeter();
 
         Timer t = new Timer();
-        t.Interval = 1;
+        t.Interval = 0.1;
         t.Timeout += delegate() { SpawnZombie(); };
         t.Start();
-    }
-
-    private void BackgroundMusicPlayer()
-    {
-        if (!MediaPlayer.IsPlaying)
-            MediaPlayer.Play("GameM" + RandomGen.NextInt(1, 5));
     }
 

2013/27/TeemuM/Game/Game/Game/Game.csproj

@@ -111 +111 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AudioPlayer.cs" />
     <Compile Include="Enemies.cs" />
     <Compile Include="Ohjelma.cs" />
@@ -116 +117 @@
     <Compile Include="Player.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -22 +22 @@
     {
         this.health = new IntMeter(health, 0, health);
-        this.health.LowerLimit += UI.GameOver;
+        this.health.LowerLimit += delegate
+        {
+            GameObject layer = new GameObject(Game.Screen.Width, Game.Screen.Height);
+            layer.Color = Color.Transparent;
+            layer.Position = this.Position;
+            Game.Add(layer, 1);
+            layer.FadeColorTo(Color.Lerp(Color.Transparent, Color.Black, 0.8), 1.0);
+
+            Label t = new Label("Game over");
+            t.Position = this.Position;
+            Game.Add(t);
+
+            Timer.SingleShot(1, delegate { Game.IsPaused = true; });
+
+            this.Destroy();
+        };
         this.Tag = "player";
         this.Shape = Shape.Rectangle;