Changeset 2809 for 2012

Timestamp:

2012-06-05 22:03:41 (11 years ago)

Author:

ramipasa

Message:

Aseet, taustat

Location:

2012/23/RamiP/YAG2DSSBase/YAG2DSS

Files:

• YAG2DSS/ALTKEngine/StaticAnimHandler.cs (modified) (4 diffs)
• YAG2DSS/YAG2DSS.cs (modified) (10 diffs)
• YAG2DSSContent/Textures/background_galaxy_blue.png (added)
• YAG2DSSContent/Textures/background_galaxy_red.png (added)
• YAG2DSSContent/Textures/background_galaxy_white.png (added)
• YAG2DSSContent/Textures/background_starsmoke_blue.png (added)
• YAG2DSSContent/Textures/background_starsmoke_red.png (added)
• YAG2DSSContent/Textures/background_starsmoke_white.png (added)
• YAG2DSSContent/YAG2DSSContent.contentproj (modified) (1 diff)

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

@@ -30 +30 @@
         }
 
-        private int GetStaticAnimIdFromClassName(string className)
+        public int GetStaticAnimIdFromClassName(string className)
         {
             for (int animTypeId = 0; animTypeId < StaticAnimTypes.Count; animTypeId++)
@@ -39 +39 @@
 
             return -1;
+        }
+
+        public void AddStaticAnim(string ClassName, Vector2 location)
+        {
+            int animId = GetStaticAnimIdFromClassName(ClassName);
+            AddStaticAnim(animId, location);
         }
 
@@ -103 +109 @@
             starSmoke.Texture = ALTKHandler.Loader.loadTexture("background_starsmoke");
 
+            StaticAnimationType starsmoke_blue = new StaticAnimationType("STARSMOKE_BLUE");
+            starsmoke_blue.DisappearingRate = 0.37;
+            starsmoke_blue.InitialVisibilityRate = 0.21;
+            starsmoke_blue.TimeEntirelyVisible = 0;
+            starsmoke_blue.TimeWithMinOpacity = 11;
+            starsmoke_blue.MinimumOpacity = 0.31;
+            starsmoke_blue.Texture = ALTKHandler.Loader.loadTexture("background_starsmoke_blue");
+
+            StaticAnimationType starsmoke_red = new StaticAnimationType("STARSMOKE_RED");
+            starsmoke_red.DisappearingRate = 0.57;
+            starsmoke_red.InitialVisibilityRate = 0.37;
+            starsmoke_red.TimeEntirelyVisible = 0;
+            starsmoke_red.TimeWithMinOpacity = 3;
+            starsmoke_red.MinimumOpacity = 0.17;
+            starsmoke_red.Texture = ALTKHandler.Loader.loadTexture("background_starsmoke_red");
+
+            StaticAnimationType starsmoke_white = new StaticAnimationType("STARSMOKE_WHITE");
+            starsmoke_white.DisappearingRate = 0.2;
+            starsmoke_white.InitialVisibilityRate = 0.125;
+            starsmoke_white.TimeEntirelyVisible = 0;
+            starsmoke_white.TimeWithMinOpacity = 15;
+            starsmoke_white.MinimumOpacity = 0.35;
+            starsmoke_white.Texture = ALTKHandler.Loader.loadTexture("background_starsmoke_white");
+
             StaticAnimationType galaxy = new StaticAnimationType("GALAXY");
             galaxy.DisappearingRate = 0.80;
@@ -111 +141 @@
             galaxy.Texture = ALTKHandler.Loader.loadTexture("background_galaxy");
 
+            StaticAnimationType galaxy_blue = new StaticAnimationType("GALAXY_BLUE");
+            galaxy_blue.DisappearingRate = 0.725;
+            galaxy_blue.InitialVisibilityRate = 0.25;
+            galaxy_blue.TimeWithMinOpacity = 13;
+            galaxy_blue.MinimumOpacity = 0.3;
+            galaxy_blue.Texture = ALTKHandler.Loader.loadTexture("background_galaxy_blue");
+
+            StaticAnimationType galaxy_red = new StaticAnimationType("GALAXY_RED");
+            galaxy_red.DisappearingRate = 0.91;
+            galaxy_red.InitialVisibilityRate = 0.31;
+            galaxy_red.TimeWithMinOpacity = 9;
+            galaxy_red.MinimumOpacity = 0.10;
+            galaxy_red.Texture = ALTKHandler.Loader.loadTexture("background_galaxy_red");
+
+            StaticAnimationType galaxy_white = new StaticAnimationType("GALAXY_WHITE");
+            galaxy_white.DisappearingRate = 0.65;
+            galaxy_white.InitialVisibilityRate = 0.165;
+            galaxy_white.TimeWithMinOpacity = 7;
+            galaxy_white.MinimumOpacity = 0.15;
+            galaxy_white.Texture = ALTKHandler.Loader.loadTexture("background_galaxy_white");
+
             StaticAnimTypes.Add(genExplosion);
             StaticAnimTypes.Add(stars1);
             StaticAnimTypes.Add(stars2);
             StaticAnimTypes.Add(starSmoke);
+            StaticAnimTypes.Add(starsmoke_blue);
+            StaticAnimTypes.Add(starsmoke_red);
+            StaticAnimTypes.Add(starsmoke_white);
             StaticAnimTypes.Add(galaxy);
+            StaticAnimTypes.Add(galaxy_blue);
+            StaticAnimTypes.Add(galaxy_red);
+            StaticAnimTypes.Add(galaxy_white);
         }
 

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

@@ -21 +21 @@
     Timer Madonreikaajastin;
     Timer Minioniajastin;
+    Timer Minioninliikuttaja;
+    Timer Automaattiammus;
 
     List<int> PelaajanKesto = new List<int>();
@@ -55 +57 @@
         Level.BackgroundColor = Color.Black;
 
+        Camera.ZoomToLevel();
+
         LuoPelaaja(300);
         LuoPelaaja(-300);
@@ -85 +89 @@
         Minioniajastin.Timeout += new Action(Minioniajastin_Timeout);
         Minioniajastin.Start();
+
+        Minioninliikuttaja = new Timer();
+        Minioninliikuttaja.Interval = 0.1;
+        Minioninliikuttaja.Timeout += new Action(Minioninliikuttaja_Timeout);
+        Minioninliikuttaja.Start();
+
+        Automaattiammus = new Timer();
+        Automaattiammus.Interval = 0.2;
+        Automaattiammus.Timeout += new Action(Automaattiammus_Timeout);
+        Automaattiammus.Start();
+    }
+
+    void LuoPelaajanAmmus(int pelaajaID)
+    {
+        Projectile PelaajanAmmus = new Projectile(4.0, 4.0, Color.Green);
+        PelaajanAmmus.Shape = Shape.Triangle;
+        PelaajanAmmus.Position = Pelaaja[pelaajaID].Position;
+        Vector jotain = Vector.FromLengthAndAngle(25.0, Pelaaja[pelaajaID].Angle);
+        PelaajanAmmus.Position = PelaajanAmmus.Position + jotain;
+        AddCollisionHandler(PelaajanAmmus, PelaajanAmmuksenTuhoaja);
+        if (pelaajaID == 0)
+        {
+            PelaajanAmmus.Tag = 1;
+        }
+        else
+        {
+            PelaajanAmmus.Tag = 2;
+        }
+        //PelaajanAmmus.Mass = 0;
+        Add(PelaajanAmmus);
+        Vector Pelaajanammus = jotain * 80;
+        PelaajanAmmus.Hit(Pelaajanammus);
+    }
+
+    void PelaajanAmmuksenTuhoaja(PhysicsObject PelaajanAmmus, PhysicsObject kohde)
+    {
+        PelaajanAmmus.Destroy();
+
+        try
+        {
+            int tagi = (int)kohde.Tag;
+            if (tagi == 5)
+            {
+                kohde.Destroy();
+            }
+            else if (tagi == 1337)
+            {
+                kohde.MaxVelocity = kohde.MaxVelocity - 1.0;
+                if (kohde.MaxVelocity < 1)
+                {
+                    kohde.Destroy();
+                }
+            }
+        }
+        catch
+        {
+        }
+    }
+
+    void Minioninliikuttaja_Timeout()
+    {
+        for (int minionID = 0; minionID < Minioni.Count; minionID++)
+        {
+            double etäisyys1;
+            double etäisyys2;
+
+            double x1 = Math.Abs(Pelaaja[0].X - Minioni[minionID].X);
+            double y1 = Math.Abs(Pelaaja[0].Y - Minioni[minionID].Y);
+            etäisyys1 = Math.Sqrt(x1 + y1);
+
+            double x2 = Math.Abs(Pelaaja[1].X - Minioni[minionID].X);
+            double y2 = Math.Abs(Pelaaja[1].Y - Minioni[minionID].Y);
+            etäisyys2 = Math.Sqrt(x2 + y2);
+
+            if (etäisyys1 > etäisyys2)
+            {
+                MinioninLiike(Minioni[minionID], 0);
+            }
+            else
+            {
+                MinioninLiike(Minioni[minionID], 1);
+            }
+        }
     }
 
@@ -90 +177 @@
     {
         Timer.SingleShot(2, AjaLuoMinioni);
+    }
+
+    void Automaattiammus_Timeout()
+    {
+        if (Keyboard.GetKeyState(Key.RightShift) == ButtonState.Down)
+        {
+            Timer.SingleShot(1, AjaLuoPelaajan1Ammus);
+        }
+
+        if (Keyboard.GetKeyState(Key.LeftShift) == ButtonState.Down)
+        {
+            Timer.SingleShot(1, AjaLuoPelaajan2Ammus);
+        }
+    }
+
+    void AjaLuoPelaajan1Ammus()
+    {
+        LuoPelaajanAmmus(0);
+    }
+
+    void AjaLuoPelaajan2Ammus()
+    {
+        LuoPelaajanAmmus(1);
     }
 
@@ -140 +250 @@
         madonreika.Y = y;
         madonreika.CollisionIgnoreGroup = 5;
+        madonreika.MaxVelocity = 15.0;
+        madonreika.Tag = 1337;
         Madonreika.Add(madonreika);
         Add(madonreika);
@@ -156 +268 @@
         minioni.Angle = (Pelaaja[1].Position - minioni.Position).Angle;
         minioni.Hit(Vector.FromLengthAndAngle(100, minioni.Angle));
+        minioni.AngularDamping = 0.1;
+        minioni.Tag = 5;
         Minioni.Add(minioni);
         Add(Minioni[Minioni.Count - 1]);
-        MinioninLiike(Minioni[Minioni.Count - 1]);
-    }
-
-    void MinioninLiike(PhysicsObject minioni)
-    {
-        minioni.Angle = (Pelaaja[1].Position - minioni.Position).Angle;
+        MinioninLiike(Minioni[Minioni.Count - 1], 0);
+    }
+
+    void MinioninLiike(PhysicsObject minioni, int pelaaja)
+    {
+        minioni.Angle = (Pelaaja[pelaaja].Position - minioni.Position).Angle;
         Vector q = Vector.FromLengthAndAngle(5.0, minioni.Angle);
         minioni.Hit(q);
@@ -176 +290 @@
         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.W, ButtonState.Down, AlkuKiihdytys, null, Pelaaja[1]);
@@ -182 +297 @@
         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);
     }
 
     void AlkuKiihdytys(PhysicsObject pelaaja)
     {
-        if (pelaaja.Velocity.Magnitude < 70)
+        if (pelaaja.Velocity.Magnitude < 7+0)
         {
             Vector o = Vector.FromLengthAndAngle(50.0, pelaaja.Angle);
@@ -232 +348 @@
         base.Update(gameTime);
 
-        for (int minioniId = 0; minioniId < Minioni.Count; minioniId++)
-        {
-            MinioninLiike(Minioni[minioniId]);
-        }
+        //for (int minioniId = 0; minioniId < Minioni.Count; minioniId++)
+        //{
+        //    MinioninLiike(Minioni[minioniId]);
+        //}
 
         //ALTKHandler.MessageDisplay.AddItem("Trololollolollololoo, lololololooo...");
@@ -304 +420 @@
         this.Components.Add(altkHandler);
 
-        for (int a = 1; a < 5; a++)
-        {
-            ALTKHandler.StaticAnimHandler.AddStaticAnim(a, new Microsoft.Xna.Framework.Vector2(0, 0));
-        }
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("STARS_1", new Microsoft.Xna.Framework.Vector2(0, 0));
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("STARS_2", new Microsoft.Xna.Framework.Vector2(0, 0));
+
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("GALAXY", new Microsoft.Xna.Framework.Vector2(0, 0));
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("GALAXY_BLUE", new Microsoft.Xna.Framework.Vector2(0, 0));
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("GALAXY_RED", new Microsoft.Xna.Framework.Vector2(0, 0));
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("GALAXY_WHITE", new Microsoft.Xna.Framework.Vector2(0, 0));
+
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("STARSMOKE", new Microsoft.Xna.Framework.Vector2(200, -250));
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("STARSMOKE_BLUE", new Microsoft.Xna.Framework.Vector2(400, 250));
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("STARSMOKE_RED", new Microsoft.Xna.Framework.Vector2(-200, -200));
+        ALTKHandler.StaticAnimHandler.AddStaticAnim("STARSMOKE_WHITE", new Microsoft.Xna.Framework.Vector2(-250, 300));
     }
 

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

@@ -101 +101 @@
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Textures\background_galaxy_blue.png">
+      <Name>background_galaxy_blue</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Textures\background_galaxy_red.png">
+      <Name>background_galaxy_red</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Textures\background_galaxy_white.png">
+      <Name>background_galaxy_white</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Textures\background_starsmoke_blue.png">
+      <Name>background_starsmoke_blue</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Textures\background_starsmoke_red.png">
+      <Name>background_starsmoke_red</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Textures\background_starsmoke_white.png">
+      <Name>background_starsmoke_white</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </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.