Changeset 2883 for 2012/23

Timestamp:

2012-06-08 13:25:50 (8 years ago)

Author:

ramipasa

Message:

 

Location:

2012/23/RamiP/YAG2DSSBase/YAG2DSS

Files:

• YAG2DSS/ALTKEngine/Cursor.cs (modified) (1 diff)
• YAG2DSS/ALTKEngine/GameSettings.cs (added)
• YAG2DSS/ALTKEngine/MusicPlayer.cs (modified) (2 diffs)
• YAG2DSS/ALTKEngine/SoundPlayer.cs (modified) (3 diffs)
• YAG2DSS/ALTKHandler.cs (modified) (5 diffs)
• YAG2DSS/GUI/AChoiceButton.cs (modified) (9 diffs)
• YAG2DSS/GUI/ATextBox.cs (modified) (3 diffs)
• YAG2DSS/GUI/Dialogs/ExitWindow.cs (modified) (2 diffs)
• YAG2DSS/GUI/Dialogs/GameSettingsWindow.cs (added)
• YAG2DSS/Properties/AssemblyInfo.cs (modified) (1 diff)
• YAG2DSS/YAG2DSS.cs (modified) (37 diffs)
• YAG2DSS/YAG2DSS.csproj (modified) (2 diffs)
• YAG2DSSContent/Music/Intro.wav (added)
• YAG2DSSContent/Music/Loop.wav (added)
• YAG2DSSContent/Music/Yag2Dss.wav (deleted)
• YAG2DSSContent/Sounds/MinionExplosion.wav (added)
• YAG2DSSContent/Sounds/PlayerExplosion.wav (added)
• YAG2DSSContent/Sounds/PowerupPicked.wav (added)
• YAG2DSSContent/Sounds/WormholeExplosion.wav (added)
• YAG2DSSContent/Sounds/WormholeHit.wav (added)
• YAG2DSSContent/Textures/powerup_chaingun.png (added)
• YAG2DSSContent/Textures/powerup_fullrestore.png (added)
• YAG2DSSContent/Textures/powerup_health.png (added)
• YAG2DSSContent/Textures/powerup_triplefire.png (added)
• YAG2DSSContent/YAG2DSSContent.contentproj (modified) (2 diffs)

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/ALTKEngine/Cursor.cs

@@ -181 +181 @@
         public override void Draw(GameTime gameTime)
         {
-            //MouseState ms = Mouse.GetState();
+            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied);
+            spriteBatch.Draw(cursorTexture, new Rectangle(SecPosX, SecPosY, 32, 32), Color.White);
+            spriteBatch.End();
 
-            //spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied);
-            ////spriteBatch.Draw(cursorTexture, new Rectangle(ms.X, ms.Y, 32, 32), Color.White);
-            //spriteBatch.End();
-
-            //base.Draw(gameTime);
-            //spriteBatch.End();
+            base.Draw(gameTime);
         }
     }

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/ALTKEngine/MusicPlayer.cs

@@ -52 +52 @@
         public List<Track> Tracklist = new List<Track>();
 
-        SoundEffect soundEffect;
-        SoundEffectInstance soundEffectInstance;
+        public SoundEffect soundEffect;
+        public SoundEffectInstance soundEffectInstance;
 
         public MusicPlayer(Game game)
@@ -114 +114 @@
             // TODO: Add your initialization code here
 
-            Track StartingMusic = new Track("YAG2DSS");
-            StartingMusic.FileName = "YAG2DSS";
-            StartingMusic.VolumeModifier = 0.85;
+            Track StartingMusic = new Track("INTRO");
+            StartingMusic.FileName = "Intro";
+            StartingMusic.VolumeModifier = 0.425;
+
+            Track LoopMusic = new Track("LOOP");
+            LoopMusic.FileName = "Loop";
+            LoopMusic.VolumeModifier = 0.425;
 
             Tracklist.Add(StartingMusic);
+            Tracklist.Add(LoopMusic);
 
             base.Initialize();

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/ALTKEngine/SoundPlayer.cs

@@ -52 +52 @@
         public List<Sound> Soundlist = new List<Sound>();
 
-        SoundEffect soundEffect;
-        SoundEffectInstance soundEffectInstance;
+        public SoundEffect soundEffect;
+        public SoundEffectInstance soundEffectInstance;
 
         public SoundPlayer(Game game)
@@ -122 +122 @@
             Sound PlayerGun = new Sound("PLAYERGUN");
             PlayerGun.FileName = "PlayerGun";
-            PlayerGun.VolumeModifier = 0.5;
+            PlayerGun.VolumeModifier = 0.25;
 
             Sound ShipEngine = new Sound("SHIPENGINE");
             ShipEngine.FileName = "ShipEngine";
-            ShipEngine.VolumeModifier = 1.0;
+            ShipEngine.VolumeModifier = 0.5;
 
             Sound Wormhole = new Sound("WORMHOLE");
             Wormhole.FileName = "Wormhole";
-            Wormhole.VolumeModifier = 1.0;
+            Wormhole.VolumeModifier = 0.5;
 
             Sound MinionGun = new Sound("MINIONGUN");
             MinionGun.FileName = "MinionGun";
-            MinionGun.VolumeModifier = 1.0;
+            MinionGun.VolumeModifier = 0.5;
 
             Sound AsteroidExplosion = new Sound("ASTEROIDEXPLOSION");
             AsteroidExplosion.FileName = "AsteroidExplosion";
-            AsteroidExplosion.VolumeModifier = 1.0;
+            AsteroidExplosion.VolumeModifier = 0.5;
 
             Sound MinionProjHit = new Sound("MINIONPROJHITPLAYER");
             MinionProjHit.FileName = "MinionProjHit";
-            MinionProjHit.VolumeModifier = 1.0;
+            MinionProjHit.VolumeModifier = 0.5;
 
             Sound PlayerCollision = new Sound("PLAYERCOLLISION");
             PlayerCollision.FileName = "PlayerCollision";
-            PlayerCollision.VolumeModifier = 0.6;
+            PlayerCollision.VolumeModifier = 0.5;
+
+            Sound PlayerExplosion = new Sound("PLAYEREXPLOSION");
+            PlayerExplosion.FileName = "PlayerExplosion";
+            PlayerExplosion.VolumeModifier = 1.0;
+
+            Sound WormholeExplosion = new Sound("WormholeExplosion");
+            WormholeExplosion.FileName = "WormholeExplosion";
+            WormholeExplosion.VolumeModifier = 0.5;
+
+            Sound WormholeHit = new Sound("WormholeHit");
+            WormholeHit.FileName = "WormholeHit";
+            WormholeHit.VolumeModifier = 0.3;
+
+            Sound MinionExplosion = new Sound("MinionExplosion");
+            MinionExplosion.FileName = "MinionExplosion";
+            MinionExplosion.VolumeModifier = 0.5;
+
+            Sound PowerupPicked = new Sound("PowerupPicked");
+            PowerupPicked.FileName = "PowerupPicked";
+            PowerupPicked.VolumeModifier = 0.5;
 
             Soundlist.Add(PlayerGun);
@@ -155 +175 @@
             Soundlist.Add(MinionProjHit); // id 5
             Soundlist.Add(PlayerCollision);
+            Soundlist.Add(PlayerExplosion);
+            Soundlist.Add(WormholeExplosion);
+            Soundlist.Add(WormholeHit);
+            Soundlist.Add(MinionExplosion); // id 10
+            Soundlist.Add(PowerupPicked);
 
             base.Initialize();

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/ALTKHandler.cs

@@ -24 +24 @@
         }
 
+        public static GUI.Dialogs.ExitWindow ExitWindow;
+        public static GUI.Dialogs.GameSettingsWindow GameSettingsWindow;
+
         public static Loader Loader;
         public static Cursor Cursor;
         public static StaticAnimHandler StaticAnimHandler;
-        public static GUI.Dialogs.ExitWindow ExitWindow;
         public static GUI.AMessageDisplay MessageDisplay;
         public static List<GUI.ALineBar> HealthBars = new List<GUI.ALineBar>();
@@ -43 +45 @@
             // TODO: Add your initialization code here
 
+            GameSettings.SetInitialSettings();
+
             base.Initialize();
 
@@ -54 +58 @@
             Cursor = new Cursor(Game);
             Cursor.Initialize();
-            Cursor.Visible = false;
+            //Cursor.Visible = false;
             Game.Components.Add(Cursor);
 
@@ -62 +66 @@
             ExitWindow.Enabled = false;
             Game.Components.Add(ExitWindow);
+
+            GameSettingsWindow = new GUI.Dialogs.GameSettingsWindow(Game);
+            GameSettingsWindow.Initialize();
+            GameSettingsWindow.Visible = true;
+            GameSettingsWindow.Enabled = true;
+            Game.Components.Add(GameSettingsWindow);
 
             MessageDisplay = new GUI.AMessageDisplay(Game);
@@ -93 +103 @@
             MusicPlayer = new Audio.MusicPlayer(Game);
             MusicPlayer.Initialize();
-            MusicPlayer.LoadTrack("YAG2DSS", true);
+            MusicPlayer.LoadTrack("INTRO", false);
 
             SoundPlayer = new Audio.SoundPlayer(Game);

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/GUI/AChoiceButton.cs

@@ -19 +19 @@
 
     // A multichoice button which allows you to switch the button's item by clicking on it.
-    public class AChooseButton : DrawableGameComponent
+    public class AChoiceButton : DrawableGameComponent
     {
         TimeSpan elapsedTime = TimeSpan.Zero;
@@ -57 +57 @@
         public int NumItems;
         public int CurrentIndex;
-        public string[] Items = new string[100];
-        public bool[] ForbiddenItems = new bool[100];
+        public List<string> Items = new List<string>();
 
         public event ChangedEventHandler Changed;
@@ -66 +65 @@
         public int MaximumAllowedIndex = 33;
 
-        public AChooseButton(Game game)
+        public AChoiceButton(Game game)
             : base(game)
         {
@@ -92 +91 @@
         public override void Update(GameTime gameTime)
         {
-            int mpX = Cursor.PosX;
-            int mpY = Cursor.PosY;
-
-            if (mpX > this.PositionX - (this.Width * .25) &&
-                mpX < this.PositionX + (this.Width / 2) &&
-                mpY > this.PositionY - (this.Height * .25) &&
-                mpY < this.PositionY + (this.Height / 2) &&
+            int mpX = Cursor.SecPosX;
+            int mpY = Cursor.SecPosY;
+
+            if (mpX > this.PositionX &&
+                mpX < this.PositionX + this.Width &&
+                mpY > this.PositionY &&
+                mpY < this.PositionY + this.Height &&
                 Locked == false)
             {
@@ -123 +122 @@
                                 if (NextItem == NumItems)
                                 {
-                                    if (ForbiddenItems[0] == false)
-                                    {
-                                        CurrentIndex = 0;
-                                        OnChanged(EventArgs.Empty);
-                                        HasChanged = true;
-                                    }
-                                    break;
-                                }
-                                else if (ForbiddenItems[NextItem] == true)
-                                {
-                                    NextItem = NextItem + 1;
+                                    CurrentIndex = 0;
+                                    OnChanged(EventArgs.Empty);
+                                    HasChanged = true;
+                                    break;
                                 }
                                 else
@@ -155 +147 @@
                                 if (NextItem == -1)
                                 {
-                                    if (ForbiddenItems[NumItems - 1] == false && (MaximumAllowedIndex == 0 | MaximumAllowedIndex > NumItems - 1))
+                                    if ((MaximumAllowedIndex == 0 | MaximumAllowedIndex > NumItems - 1))
                                     {
                                         CurrentIndex = NumItems - 1;
@@ -162 +154 @@
                                     }
                                     break;
-                                }
-                                else if (ForbiddenItems[NextItem] == true)
-                                {
-                                    NextItem = NextItem - 1;
                                 }
                                 else
@@ -189 +177 @@
         }
 
+        public void Update(GameTime gameTime, int baseY, int baseX)
+        {
+            int mpX = Cursor.SecPosX;
+            int mpY = Cursor.SecPosY;
+
+            if (mpX > this.PositionX + baseX &&
+                mpX < this.PositionX + this.Width + baseX &&
+                mpY > this.PositionY + baseY &&
+                mpY < this.PositionY + this.Height + baseY &&
+                Locked == false)
+            {
+                this.TextColorCurrent = TextColorPressed;
+                if (Cursor.SecLeftClicked)
+                {
+                    if (CurrentIndex == 1)
+                        CurrentIndex = 0;
+                    else
+                        CurrentIndex = 1;
+                }
+            }
+            else
+            {
+                this.TextColorCurrent = TextColor;
+                Pressed = false;
+            }
+        }
+
         public override void Draw(GameTime gameTime)
         {
@@ -201 +216 @@
             spriteBatch.End();
         }
+
+        public void Draw(GameTime gameTime, int baseX, int baseY)
+        {
+            spriteBatch.Begin();
+            Vector2 pos = new Vector2(PositionX + baseX, PositionY + baseY);
+            if (Texture != null)
+            {
+                spriteBatch.Draw(Texture, pos, Color.White);
+            }
+            spriteBatch.DrawString(spriteFont, Items[CurrentIndex], new Vector2(pos.X + 1, pos.Y + 1), Color.Black);
+            spriteBatch.DrawString(spriteFont, Items[CurrentIndex], pos, TextColorCurrent);
+            spriteBatch.End();
+        }
     }
 

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/GUI/ATextBox.cs

@@ -28 +28 @@
         SpriteBatch spriteBatch;
         SpriteFont spriteFont;
-        public bool UseListBoxFont = true;
-
-        public int SelectedItemIndex = -1;
 
         public int Width = 200;
@@ -53 +50 @@
         public bool MousePressed = false;
 
-        public int Spacing;
-
         public bool Selected = false;
         public bool EnterPressed = false;
@@ -142 +137 @@
                     if (spriteFont.MeasureString(Text + "  ").X > Width)
                     {
-                        EnterPressed = true;
+                        Text = Text.Remove(Text.Length - 1);
                     }
                 }

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/GUI/Dialogs/ExitWindow.cs

@@ -191 +191 @@
             // TODO: Add your update code here
 
-            bool cursorOnChoice = false;
-
             if (Cursor.SecPosX > sizePos.X && Cursor.SecPosY > sizePos.Y &&
                 Cursor.SecPosX < sizePos.X + sizePos.Width && Cursor.SecPosY < sizePos.Y + sizePos.Height)
@@ -204 +202 @@
                 mousePosY = Cursor.SecPosY;
 
-                if (Cursor.SecLeftPressed && System.Windows.Forms.Form.ActiveForm != null && cursorOnChoice == false)
+                if (Cursor.SecLeftPressed && System.Windows.Forms.Form.ActiveForm != null)
                 {
                     if (MousePressed == true)

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/Properties/AssemblyInfo.cs

@@ -8 +8 @@
 [assembly: AssemblyTitle("YAG2DSS")]
 [assembly: AssemblyProduct("YAG2DSS")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Yet Another Generic 2D Space Shooter")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyCopyright("Copyright © Rampastring & Tetraedri 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/YAG2DSS.cs

@@ -54 +54 @@
     int Pelaajan2Pisteet = 0;
 
-    
+    public bool Initialized = false;
+    public static bool SettingsConfirmed = false;
+
     double Pelaajan1Kerroin = 1.0;
     double Pelaajan2Kerroin = 1.0;
@@ -60 +62 @@
     public override void Begin()
     {
-        #region Cursor handling
+        if (!Initialized)
+        {
+            SetWindowSize(1024, 768, true);
+
+            KeyboardEventInput.Initialize(this.Window);
+
+            #region Cursor handling
+            CreateCursor();
+
+            Initialized = true;
+            #endregion
+        }
+
+        Level.BackgroundColor = Color.Black;
+
+        Camera.ZoomToLevel();
+
+        if (SettingsConfirmed)
+        {
+            LuoKentta();
+            AsetaNappaimet();
+            LuoAjastin();
+            //LuoMadonreika();
+            //PhoneBackButton.Listen(ConfirmExit, "Lopeta peli");
+            Keyboard.Listen(Key.Escape, ButtonState.Pressed, ShowExit, "Lopeta peli");
+            Explotions();
+        }
+    }
+
+    public void CreateCursor()
+    {
         Kursori = new GameObject(32, 32);
         Kursori.Image = Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "cursor.png"));
@@ -67 +99 @@
         Mouse.ListenMovement(0.1, handler, "");
         Add(Kursori);
-        #endregion
-        LuoKentta();
-        AsetaNappaimet();
-        LuoAjastin();
-        //LuoMadonreika();
-        //PhoneBackButton.Listen(ConfirmExit, "Lopeta peli");
-        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ShowExit, "Lopeta peli");
-        Explotions();
     }
 
@@ -258 +282 @@
         alaReuna.CollisionIgnoreGroup = 3;
 
-        Level.BackgroundColor = Color.Black;
-
-        Camera.ZoomToLevel();
-
         LuoPelaaja(300);
         Pelaaja[0].Tag = 11;
@@ -322 +342 @@
 
         Vaikeuttaja = new Timer();
-        Vaikeuttaja.Interval = 5.0;
+        Vaikeuttaja.Interval = 6.0;
         Vaikeuttaja.Timeout += new Action(Vaikeuttaja_Timeout);
         Vaikeuttaja.Start();
@@ -341 +361 @@
         Triplefire1 = new Timer();
         Triplefire1.Interval = 0.2;
+        Triplefire1.Timeout += new Action(Triplefire1_Timeout);
+
+        Triplefire2 = new Timer();
+        Triplefire2.Interval = 0.2;
+        Triplefire2.Timeout += new Action(Triplefire2_Timeout);
+
+    }
+
+    void Triplefire2_Timeout()
+    {
+        if (Keyboard.GetKeyState(Key.LeftShift) == ButtonState.Down)
+        {
+            LuoPelaajanAmmus(1, Angle.FromDegrees(Pelaaja[1].Angle.Degrees + 20));
+            LuoPelaajanAmmus(1, Angle.FromDegrees(Pelaaja[1].Angle.Degrees - 20));
+        }
+    }
+
+    void Triplefire1_Timeout()
+    {
+        if (Keyboard.GetKeyState(Key.RightShift) == ButtonState.Down)
+        {
+            LuoPelaajanAmmus(0, Angle.FromDegrees(Pelaaja[0].Angle.Degrees + 20));
+            LuoPelaajanAmmus(0, Angle.FromDegrees(Pelaaja[0].Angle.Degrees - 20));
+            
+        }
     }
 
@@ -346 +391 @@
     {
         if (Keyboard.GetKeyState(Key.RightShift) == ButtonState.Down)
-            LuoPelaajanAmmus(0);
+            LuoPelaajanAmmus(0, Pelaaja[0].Angle);
     }
 
@@ -353 +398 @@
     {
         if (Keyboard.GetKeyState(Key.LeftShift) == ButtonState.Down)
-           LuoPelaajanAmmus(1);
+           LuoPelaajanAmmus(1, Pelaaja[1].Angle);
     }
 
@@ -362 +407 @@
         Asteroidiajastin.Interval = Asteroidiajastin.Interval * 0.9;
         MinioninAmmus.Interval = MinioninAmmus.Interval * 0.95;
-        Vaikeuttaja.Interval = Vaikeuttaja.Interval * 1.2;
+        Vaikeuttaja.Interval = Vaikeuttaja.Interval * 1.25;
     }
 
@@ -386 +431 @@
     }
 
-    void LuoPelaajanAmmus(int pelaajaID)
+    void LuoPelaajanAmmus(int pelaajaID, Angle angle)
     {
         if (Pelaaja[pelaajaID].IsDestroyed)
@@ -396 +441 @@
         PelaajanAmmus.Shape = Shape.Rectangle;
 
-        PelaajanAmmus.Angle = Pelaaja[pelaajaID].Angle;
+        PelaajanAmmus.Angle = angle;
         PelaajanAmmus.Width = 12;
         PelaajanAmmus.Height = 3;
         PelaajanAmmus.Position = Pelaaja[pelaajaID].Position; 
        
-        Vector jotain = Vector.FromLengthAndAngle(25.0, Pelaaja[pelaajaID].Angle);
+        Vector jotain = Vector.FromLengthAndAngle(25.0, angle);
         PelaajanAmmus.Position = PelaajanAmmus.Position + jotain;
         PelaajanAmmus.Mass = 1;
@@ -441 +486 @@
                 ALTKHandler.StaticAnimHandler.AddStaticAnim(17, ALTKHandler.AdjustJypeliVectorToXna(kohde.X, kohde.Y));
                 ALTKHandler.StaticAnimHandler.AddStaticAnim(18, ALTKHandler.AdjustJypeliVectorToXna(kohde.X, kohde.Y));
+                ALTKHandler.SoundPlayer.PlaySound(10);
                 kohde.Destroy();
                 if (ammuksenTagi == 1)
@@ -457 +503 @@
                 WormholeExplosionES.AddEffect(PelaajanAmmus.Position, 150);
                 WormholeExplosionES2.AddEffect(PelaajanAmmus.Position, 5);
+                ALTKHandler.SoundPlayer.PlaySound(9);
 
                 if (ammuksenTagi == 1)
@@ -473 +520 @@
                     ALTKHandler.StaticAnimHandler.AddStaticAnim(15, ALTKHandler.AdjustJypeliVectorToXna(kohde.X, kohde.Y));
                     kohde.Destroy();
+                    ALTKHandler.SoundPlayer.PlaySound(8);
+                    CreatePowerUp(kohde.Position);
+
                     if (ammuksenTagi == 1)
                     {
@@ -494 +544 @@
                     LisaaPisteita(0, Convert.ToInt32((1 / kohde.Mass) * 5 * Pelaajan1Kerroin));
 
-                    if (kohde.Mass < (Math.Abs((kohde.Left - kohde.Right) * (kohde.Top - kohde.Bottom))) / 20)
+                    if (kohde.Mass < 40.0)
                     {
                         TuhoaAsteroidiEfekti(kohde.Position);
+                        kohde.Destroy();
                         LisaaKerrointa(0, 0.5);
                     }
@@ -504 +555 @@
                     LisaaPisteita(1, Convert.ToInt32((1 / kohde.Mass) * 5 * Pelaajan2Kerroin));
 
-                    if (kohde.Mass < (Math.Abs((kohde.Left - kohde.Right) * (kohde.Top - kohde.Bottom))) / 20)
+                    if (kohde.Mass < 40.0)
                     {
                         TuhoaAsteroidiEfekti(kohde.Position);
+                        kohde.Destroy();
                         LisaaKerrointa(1, 0.5);
                     }
@@ -548 +600 @@
                 ALTKHandler.StaticAnimHandler.AddStaticAnim(17, ALTKHandler.AdjustJypeliVectorToXna(kohde.X, kohde.Y));
                 ALTKHandler.StaticAnimHandler.AddStaticAnim(18, ALTKHandler.AdjustJypeliVectorToXna(kohde.X, kohde.Y));
+                ALTKHandler.SoundPlayer.PlaySound(10);
 
                 PlayerHitES.AddEffect(kohde.Position, 150);
@@ -562 +615 @@
                 ALTKHandler.StaticAnimHandler.AddStaticAnim(17, ALTKHandler.AdjustJypeliVectorToXna(kohde.X, kohde.Y));
                 ALTKHandler.StaticAnimHandler.AddStaticAnim(18, ALTKHandler.AdjustJypeliVectorToXna(kohde.X, kohde.Y));
+                ALTKHandler.SoundPlayer.PlaySound(10);
 
                 PlayerHitES.AddEffect(kohde.Position, 150);
@@ -701 +755 @@
     void AjaLuoPelaajan1Ammus()
     {
-        LuoPelaajanAmmus(0);
+        LuoPelaajanAmmus(0, Pelaaja[0].Angle);
     }
 
     void AjaLuoPelaajan2Ammus()
     {
-        LuoPelaajanAmmus(1);
+        LuoPelaajanAmmus(1, Pelaaja[1].Angle);
     }
 
@@ -840 +894 @@
         PhysicsObject asteroidi = new PhysicsObject (RandomGen.NextDouble (10, 60), RandomGen.NextDouble(10, 60));
         asteroidi.Shape = Shape.Circle;
+        asteroidi.Color = new Color(96, 96, 96);
         asteroidi.X = x;
         asteroidi.Y = y;
@@ -861 +916 @@
     void LuoMinioni(int madonreikaID)
     {
+        if (!GameSettings.MinionsEnabled)
+            return;
+        
         PhysicsObject minioni = new PhysicsObject(20, 20);
 
@@ -888 +946 @@
             if (tagi == 1)
             {
+                madonreika.MaxVelocity = madonreika.MaxVelocity - 1.0;
+
+                WormholeExplosionES.AddEffect(kohde.Position, 150);
+                WormholeExplosionES2.AddEffect(kohde.Position, 5);
+                ALTKHandler.SoundPlayer.PlaySound(9);
+
                 LisaaPisteita(0, Convert.ToInt32 ( 2 * Pelaajan1Kerroin));
-            }
-            if (tagi == 2)
-            {
+
+                if (kohde.MaxVelocity < 1)
+                {
+                    WormholeExplosionES.AddEffect(madonreika.Position, 500);
+                    WormholeExplosionES2.AddEffect(madonreika.Position, 150);
+                    ALTKHandler.StaticAnimHandler.AddStaticAnim(15, ALTKHandler.AdjustJypeliVectorToXna(madonreika.X, madonreika.Y));
+                    kohde.Destroy();
+                    ALTKHandler.SoundPlayer.PlaySound(8);
+                    CreatePowerUp(kohde.Position);
+
+                    LisaaPisteita(0, Convert.ToInt32(13 * Pelaajan1Kerroin));
+                }
+            }
+            else if (tagi == 2)
+            {
+                madonreika.MaxVelocity = madonreika.MaxVelocity - 1.0;
+
+                WormholeExplosionES.AddEffect(kohde.Position, 150);
+                WormholeExplosionES2.AddEffect(kohde.Position, 5);
+                ALTKHandler.SoundPlayer.PlaySound(9);
+
                 LisaaPisteita(1, Convert.ToInt32 ( 2 * Pelaajan2Kerroin));
-            }
-            if (tagi == 11)
+
+                if (kohde.MaxVelocity < 1)
+                {
+                    WormholeExplosionES.AddEffect(kohde.Position, 500);
+                    WormholeExplosionES2.AddEffect(kohde.Position, 150);
+                    ALTKHandler.StaticAnimHandler.AddStaticAnim(15, ALTKHandler.AdjustJypeliVectorToXna(kohde.X, kohde.Y));
+                    kohde.Destroy();
+                    ALTKHandler.SoundPlayer.PlaySound(8);
+                    CreatePowerUp(kohde.Position);
+
+                    LisaaPisteita(1, Convert.ToInt32(13 * Pelaajan1Kerroin));
+                }
+            }
+            else if (tagi == 11)
             {
                 ALTKHandler.HealthBars[0].Value = ALTKHandler.HealthBars[0].Value - 17;
@@ -931 +1025 @@
         Vector b = Vector.FromLengthAndAngle(250.0, Minioni[minioniID].Angle);
         minioninAmmus.Hit(b);
-        ALTKHandler.SoundPlayer.PlaySound(3);
+        //ALTKHandler.SoundPlayer.PlaySound(3);
     }
 
@@ -946 +1040 @@
 
             Pelaaja[0].Destroy();
+
+            ALTKHandler.SoundPlayer.PlaySound(7); // BOOOOOOOOOOOOOMMMMMM
+            ALTKHandler.MessageDisplay.AddItem(GameSettings.PlayerNames[0] + " tuhoutui!");
+
+            if (Pelaaja[1].IsDestroyed || !GameSettings.MinionsEnabled)
+            {
+                ALTKHandler.MessageDisplay.AddItem("Paina F11 aloittaaksesi uuden pelin.");
+            }
         }
 
@@ -958 +1060 @@
 
             Pelaaja[1].Destroy();
+
+            ALTKHandler.SoundPlayer.PlaySound(7); // BOOOOOOOOOOOOOMMMMMM
+            ALTKHandler.MessageDisplay.AddItem(GameSettings.PlayerNames[1] + " tuhoutui!");
+
+            if (Pelaaja[0].IsDestroyed || !GameSettings.MinionsEnabled)
+            {
+                ALTKHandler.MessageDisplay.AddItem("Paina F11 aloittaaksesi uuden pelin.");
+            }
         } 
 
@@ -1034 +1144 @@
     void AsetaNappaimet()
     {
-        Keyboard.Listen(Key.Up, ButtonState.Down, AlkuKiihdytys, null, Pelaaja[0]);
-        Keyboard.Listen(Key.Up, ButtonState.Down, Kiihdyta, null, Pelaaja[0]);
-        Keyboard.Listen(Key.Down, ButtonState.Down, Hidasta, null, Pelaaja[0]);
-        Keyboard.Listen(Key.Left, ButtonState.Down, kaannaVasemmalle, null, Pelaaja[0]);
-        Keyboard.Listen(Key.Right, ButtonState.Down, kaannaOikealle, null, Pelaaja[0]);
-        Keyboard.Listen(Key.RightShift, ButtonState.Pressed, LuoPelaajanAmmus, null, 0);
+        Keyboard.Listen(Key.Up, ButtonState.Down, AlkuKiihdytys, String.Empty, Pelaaja[0]);
+        Keyboard.Listen(Key.Up, ButtonState.Down, Kiihdyta, String.Empty, Pelaaja[0]);
+        Keyboard.Listen(Key.Down, ButtonState.Down, Hidasta,  String.Empty, Pelaaja[0]);
+        Keyboard.Listen(Key.Left, ButtonState.Down, kaannaVasemmalle,  String.Empty, Pelaaja[0]);
+        Keyboard.Listen(Key.Right, ButtonState.Down, kaannaOikealle,  String.Empty, Pelaaja[0]);
+        Keyboard.Listen(Key.RightShift, ButtonState.Pressed, AjaLuoPelaajan1Ammus, String.Empty);
         
-        Keyboard.Listen(Key.W, ButtonState.Down, AlkuKiihdytys, null, Pelaaja[1]);
-        Keyboard.Listen(Key.W, ButtonState.Down, Kiihdyta, null, Pelaaja[1]);
-        Keyboard.Listen(Key.S, ButtonState.Down, Hidasta, null, Pelaaja[1]);
-        Keyboard.Listen(Key.A, ButtonState.Down, kaannaVasemmalle, null, Pelaaja[1]);
-        Keyboard.Listen(Key.D, ButtonState.Down, kaannaOikealle, null, Pelaaja[1]);
-        Keyboard.Listen(Key.LeftShift, ButtonState.Pressed, LuoPelaajanAmmus, null, 1);
-
-        Keyboard.Listen(Key.F11, ButtonState.Pressed, Reset, null);
+        Keyboard.Listen(Key.W, ButtonState.Down, AlkuKiihdytys,  String.Empty, Pelaaja[1]);
+        Keyboard.Listen(Key.W, ButtonState.Down, Kiihdyta,  String.Empty, Pelaaja[1]);
+        Keyboard.Listen(Key.S, ButtonState.Down, Hidasta,  String.Empty, Pelaaja[1]);
+        Keyboard.Listen(Key.A, ButtonState.Down, kaannaVasemmalle,  String.Empty, Pelaaja[1]);
+        Keyboard.Listen(Key.D, ButtonState.Down, kaannaOikealle,  String.Empty, Pelaaja[1]);
+        Keyboard.Listen(Key.LeftShift, ButtonState.Pressed, AjaLuoPelaajan2Ammus, String.Empty);
+
+        Keyboard.Listen(Key.F11, ButtonState.Pressed, Reset, String.Empty);
     }
 
@@ -1097 +1207 @@
                 {
                     ALTKHandler.HealthBars[0].Value = Convert.ToInt32(ALTKHandler.HealthBars[0].Value + 20);
-                    Powerup.Destroy();
                 }
                 else
@@ -1104 +1213 @@
                 }
                 Powerup.Destroy();
-            }
-            else if (pelaaja == 22)
+                ALTKHandler.SoundPlayer.PlaySound(11);
+            }
+            else if (pelaaja == 12)
             {
                 if (ALTKHandler.HealthBars[1].Value < 80)
@@ -1116 +1226 @@
                 }
                 Powerup.Destroy();
+                ALTKHandler.SoundPlayer.PlaySound(11);
             }
         }
@@ -1124 +1235 @@
                 Konekivaari1.Start(200);
                 Powerup.Destroy();
+                ALTKHandler.SoundPlayer.PlaySound(11);
             }
             else if (pelaaja == 12)
             {
-                Konekivaari1.Start(200);
+                Konekivaari2.Start(200);
                 Powerup.Destroy();
+                ALTKHandler.SoundPlayer.PlaySound(11);
             }
         }
@@ -1137 +1250 @@
                 Triplefire1.Start(50);
                 Powerup.Destroy();
-            }
-            else if (pelaaja == 22)
+                ALTKHandler.SoundPlayer.PlaySound(11);
+            }
+            else if (pelaaja == 12)
             {
                 Triplefire2.Start(50);
                 Powerup.Destroy();
+                ALTKHandler.SoundPlayer.PlaySound(11);
             }
         }
@@ -1149 +1264 @@
             {
                 ALTKHandler.HealthBars[0].Value = 100;
-            }
-            else if (pelaaja == 22)
+                Powerup.Destroy();
+                ALTKHandler.SoundPlayer.PlaySound(11);
+            }
+            else if (pelaaja == 12)
             {
                 ALTKHandler.HealthBars[1].Value = 100;
-            }
-        }
-    }
-
-    void PowerUps(double position)
-    {
-        int arvo = RandomGen.NextInt(10);
+                Powerup.Destroy();
+                ALTKHandler.SoundPlayer.PlaySound(11);
+            }
+        }
+    }
+
+    void CreatePowerUp(Vector position)
+    {
+        int arvo = RandomGen.NextInt(20);
         //int pelaaja = (int)pelaajaID].Tag;
 
-        if (arvo == 1)
+        int tagi = 0;
+
+        PhysicsObject powerup = PhysicsObject.CreateStaticObject(25.0, 25.0);
+
+        if (arvo == 1 || arvo == 2)
         {
             //Energiaboosti
-            PhysicsObject Energia10 = PhysicsObject.CreateStaticObject (25, 25);
-            Energia10.CollisionIgnoreGroup = 5;
-            Energia10.Tag = 200;
-            AddCollisionHandler(Energia10, PowerUpCollisionHandler);
-            Add(Energia10);
-            
-        }
-        else if (arvo == 3)
+            tagi = 200;
+            powerup.Image = Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "powerup_health.png"));
+        }
+        else if (arvo == 3 || arvo == 4)
         {
             //Konekivääri
-            PhysicsObject Konekivaari = PhysicsObject.CreateStaticObject(25, 25);
-            Konekivaari.Color = Color.Blue;
-            Konekivaari.Tag = 201;
-            AddCollisionHandler(Konekivaari, PowerUpCollisionHandler);
-            Add(Konekivaari);                      
-        }
-        else if (arvo == 4)
+            tagi = 201;
+            powerup.Image = Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "powerup_chaingun.png"));
+        }
+        else if (arvo == 5 || arvo == 6 )
         {
             //Triplefire
-            PhysicsObject TripleFire = PhysicsObject.CreateStaticObject(25, 25, Shape.Triangle);
-            TripleFire.Color = Color.Red;
-            TripleFire.Tag = 3;
-            AddCollisionHandler(TripleFire, PowerUpCollisionHandler);
-            Add(TripleFire);                        
-        }
-        else if (arvo == 5)
+            tagi = 202;
+            powerup.Image = Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "powerup_triplefire.png"));   
+        }
+        else if (arvo == 7)
         {
             //Full restore
-            PhysicsObject FullRestore = PhysicsObject.CreateStaticObject(25, 25);
-            FullRestore.Tag = 204;
-            AddCollisionHandler(FullRestore, PowerUpCollisionHandler);
-            Add(FullRestore);
+            tagi = 203;
+            powerup.Image = Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "powerup_fullrestore.png"));
         }
         else
         {
-        }
+            return;
+        }
+
+        powerup.CollisionIgnoreGroup = 5;
+        powerup.Position = position;
+        powerup.Tag = tagi;
+        AddCollisionHandler(powerup, PowerUpCollisionHandler);
+        Add(powerup);
     }
 
@@ -1210 +1328 @@
         Pelaaja.Clear();
         Madonreika.Clear();
-        Begin();
         ALTKHandler.StaticAnimHandler.ClearAnims();
         AddInitialAnims();
@@ -1221 +1338 @@
         Pelaajan2Pisteet = 0;
         Pelaajan2Kerroin = 1.0;
+
+        ALTKHandler.ScoreDisplayers[0].Color = Microsoft.Xna.Framework.Color.Purple;
+        ALTKHandler.ScoreDisplayers[1].Color = Microsoft.Xna.Framework.Color.Purple;
+
+        CreateCursor();
+        SettingsConfirmed = false;
+        ALTKHandler.GameSettingsWindow.Enabled = true;
+        ALTKHandler.GameSettingsWindow.Visible = true;
+        ALTKHandler.Cursor.Visible = true;
     }
 
@@ -1240 +1366 @@
     {
         base.Update(gameTime);
+
+        if (ALTKHandler.MusicPlayer.soundEffectInstance.State == Microsoft.Xna.Framework.Audio.SoundState.Stopped)
+        {
+            ALTKHandler.MusicPlayer.LoadTrack("LOOP", true);
+        }
 
         ALTKHandler.ScoreDisplayers[0].Value = Pelaajan1Pisteet;
@@ -1318 +1449 @@
         ALTKHandler.StaticAnimHandler.AddStaticAnim("STARSMOKE_RED", new Microsoft.Xna.Framework.Vector2(-350, -200));
         ALTKHandler.StaticAnimHandler.AddStaticAnim("STARSMOKE_WHITE", new Microsoft.Xna.Framework.Vector2(-300, 250));
+
+        ALTKHandler.MusicPlayer.StopPlaying();
+        ALTKHandler.MusicPlayer.LoadTrack("INTRO", false);
     }
 
@@ -1323 +1457 @@
     {
         //this.StopAll();
-        if (!ALTKHandler.ExitWindow.Enabled)
+        if (!ALTKHandler.ExitWindow.Enabled && !ALTKHandler.GameSettingsWindow.Enabled)
         {
             ALTKHandler.ExitWindow.Enabled = true;
             ALTKHandler.ExitWindow.Visible = true;
 
-            Kursori.IsVisible = true;
+            ALTKHandler.Cursor.Visible = true;
         }
     }

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/YAG2DSS.csproj

@@ -118 +118 @@
     <Compile Include="ALTKEngine\Cursor.cs" />
     <Compile Include="ALTKEngine\GameHandler.cs" />
+    <Compile Include="ALTKEngine\GameSettings.cs" />
     <Compile Include="ALTKEngine\KeyboardEventInput.cs" />
     <Compile Include="ALTKEngine\Loader.cs" />
@@ -135 +136 @@
     <Compile Include="GUI\AUIButton.cs" />
     <Compile Include="GUI\Dialogs\ExitWindow.cs" />
+    <Compile Include="GUI\Dialogs\GameSettingsWindow.cs" />
     <Compile Include="Ohjelma.cs" />
     <Compile Include="YAG2DSS.cs" />

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSSContent/YAG2DSSContent.contentproj

@@ -148 +148 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="Music\Yag2Dss.wav">
-      <Name>Yag2Dss</Name>
-      <Importer>WavImporter</Importer>
-      <Processor>SoundEffectProcessor</Processor>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Sounds\MinionGun.wav">
       <Name>MinionGun</Name>
@@ -298 +290 @@
     <None Include="Sounds\PlayerCollision.wav">
       <Name>PlayerCollision</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Textures\powerup_chaingun.png">
+      <Name>powerup_chaingun</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Textures\powerup_fullrestore.png">
+      <Name>powerup_fullrestore</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Textures\powerup_health.png">
+      <Name>powerup_health</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Textures\powerup_triplefire.png">
+      <Name>powerup_triplefire</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Sounds\PlayerExplosion.wav">
+      <Name>PlayerExplosion</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Sounds\WormholeHit.wav">
+      <Name>WormholeHit</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Sounds\WormholeExplosion.wav">
+      <Name>WormholeExplosion</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Sounds\MinionExplosion.wav">
+      <Name>MinionExplosion</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Sounds\PowerupPicked.wav">
+      <Name>PowerupPicked</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Music\Intro.wav">
+      <Name>Intro</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Music\Loop.wav">
+      <Name>Loop</Name>
       <Importer>WavImporter</Importer>
       <Processor>SoundEffectProcessor</Processor>