Changeset 4485 for 2013/27/JoonasM/RnGPlatformShooter/RnGPlatformShooter/RnGPlatformShooter/RnGPlatformShooter.cs

Timestamp:

2013-07-05 12:30:03 (8 years ago)

Author:

joarmuho

Message:

Talletus.

File:

• 2013/27/JoonasM/RnGPlatformShooter/RnGPlatformShooter/RnGPlatformShooter/RnGPlatformShooter.cs (modified) (6 diffs)

2013/27/JoonasM/RnGPlatformShooter/RnGPlatformShooter/RnGPlatformShooter/RnGPlatformShooter.cs

@@ -13 +13 @@
     const int RUUDUN_KOKO = 40;
 
-    double VanhaTaso = 0;
-    int CameraSpeed = 30;
+    double vanhaTaso = 0;
 
     PlatformCharacter pelaaja1;
-
+    DoubleMeter etenemisVauhtiMittari;
     Image pelaajanKuva = LoadImage("norsu");
     Image tahtiKuva = LoadImage("tahti");
@@ -37 +36 @@
     public override void Begin()
     {
+        IsFullScreen = true;
         Label tekstikentta = new Label("RnGPlatformShooter");
         tekstikentta.Font = Font.DefaultLarge;
@@ -53 +53 @@
     {
         ClearAll();
+        etenemisVauhtiMittari = new DoubleMeter(30, 30, double.MaxValue);
+        etenemisVauhtiMittari.AddOverTime(190, 60);
+        etenemisVauhtiMittari.Changed += delegate
+        {
+            Camera.Velocity = new Vector(etenemisVauhtiMittari.Value, 0);
+        };
         Gravity = new Vector(0, -1500);
 
         Camera.X = 200;
-        Camera.Velocity = new Vector(CameraSpeed, 0);
+        Camera.Velocity = new Vector(etenemisVauhtiMittari.Value, 0);
         Camera.ZoomFactor = 1.5;
 
@@ -65 +71 @@
     void LuoKentta()
     {
-        PhysicsObject SolarS = PhysicsObject.CreateStaticObject(64, 64);
-        SolarS.X = 790;
-        SolarS.Y = 300;
-        SolarS.Image = Solar;
-        SolarS.IgnoresCollisionResponse = true;
-        SolarS.Velocity = new Vector(CameraSpeed, 0);
-        Add(SolarS);
-        VanhaTaso = 0;
+        Widget solarS = new Widget(82, 82);
+        solarS.X = 870;
+        solarS.Y = 450;
+        solarS.Image = Solar;
+        Add(solarS);
+        vanhaTaso = 0;
         PhysicsObject StartingPlatform = PhysicsObject.CreateStaticObject(80, 20);
         StartingPlatform.Y = 100;
@@ -91 +95 @@
             pisteLaskuri.Value += 1;
 
-            if (Camera.Velocity.X < 190)
-            {
-                Camera.Velocity *= 1.05;
-                SolarS.Velocity *= 1.05;
-            }
-            
             if (pelaaja1.Y < -400)
             {
@@ -145 +143 @@
     void LisaaTaso(bool ensimmainenKerta = false)
     {
-        if (RandomGen.NextInt(1, 10) != 1)
-        {
-            PhysicsObject taso = PhysicsObject.CreateStaticObject(RandomGen.NextInt(62, 82), 20);
-            taso.X = RandomGen.NextInt(150, 280) + VanhaTaso;
-            taso.Y = RandomGen.NextInt(-200, 75);
-            taso.Color = RandomGen.NextColor();
-            taso.Oscillate(Vector.UnitY, RandomGen.NextInt(85, 250), 0.5);
-            VanhaTaso = taso.X;
-            taso.MakeOneWay();
-            Add(taso);
-
-            if (ensimmainenKerta == false)
-            {
-                if (RandomGen.NextInt(1, 6) == 1)
+        if (vanhaTaso < Camera.ScreenToWorld(new Vector(Screen.Right, 0)).X + 50)
+        {
+            if (RandomGen.NextInt(1, 10) > 2)
+            {
+                PhysicsObject taso = PhysicsObject.CreateStaticObject(RandomGen.NextInt(62, 82), 20);
+                taso.X = RandomGen.NextInt(150, 280) + vanhaTaso;
+                taso.Y = RandomGen.NextInt(-180, 75);
+                taso.Color = RandomGen.NextColor();
+                taso.Oscillate(Vector.UnitY, RandomGen.NextInt(85, 250), 0.4);
+                vanhaTaso = taso.X;
+                taso.MakeOneWay();
+                taso.CollisionIgnoreGroup = 1;
+                Add(taso);
+
+                if (ensimmainenKerta == false)
                 {
-                    PhysicsObject vihu = PhysicsObject.CreateStaticObject(32, 32);
-                    vihu.X = taso.X;
-                    vihu.Y = RandomGen.NextInt(0, 10) + taso.Y;
-                    vihu.Image = tahtiKuva;
-                    vihu.Tag = "vihu";
-                    vihu.AngularVelocity = 10.0;
-                    Add(vihu);
+
+                    if (RandomGen.NextInt(1, 6) == 1)
+                    {
+                        PhysicsObject vihu = PhysicsObject.CreateStaticObject(32, 32);
+                        vihu.X = taso.X;
+                        vihu.Y = RandomGen.NextInt(0, 10) + taso.Y;
+                        vihu.Image = tahtiKuva;
+                        vihu.Tag = "vihu";
+                        vihu.AngularVelocity = 10.0;
+                        Add(vihu);
+                    }
+                    if (RandomGen.NextInt(1, 20) == 1)
+                    {
+                        PhysicsObject Helichopter = PhysicsObject.CreateStaticObject(32, 32);
+                        Helichopter.X = taso.X + RandomGen.NextInt(40, 100);
+                        Helichopter.Y = 340;
+                        Helichopter.Image = HeliChapter;
+                        PlasmaCannon HeliChopterAse = new PlasmaCannon(30, 10);
+                        HeliChopterAse.Angle += Angle.FromDegrees(RandomGen.NextInt(-125, -25));
+                        Timer Asetimer = new Timer();
+                        Asetimer.Interval = 1;
+                        Asetimer.Timeout += delegate
+                        {
+                            PhysicsObject HeliAmmus = HeliChopterAse.Shoot();
+                            HeliAmmus.Tag = "vihu";
+                            HeliAmmus.LifetimeLeft = TimeSpan.FromSeconds(0.8);
+                            AddCollisionHandler(HeliAmmus, CollisionHandler.DestroyObject);
+                        };
+                        Asetimer.Start();
+                        Helichopter.Add(HeliChopterAse);
+                        Helichopter.IgnoresCollisionResponse = true;
+                        Helichopter.Tag = "HeliTag";
+                        Add(Helichopter);
+
+                        Helichopter.Destroyed += Asetimer.Stop;
+                        Helichopter.Destroyed += HeliChopterAse.Destroy;
+                    }
+                    if (RandomGen.NextInt(1, 10) == 1)
+                    {
+                        PhysicsObject LaavaPallo = new PhysicsObject(32, 32, Shape.Circle);
+                        LaavaPallo.X = pelaaja1.X;
+                        LaavaPallo.Y = Level.Bottom;
+                        LaavaPallo.Image = FireLava;
+                        LaavaPallo.Tag = "vihu";
+                        LaavaPallo.IgnoresCollisionResponse = true;
+                        Add(LaavaPallo);
+                        LaavaPallo.Hit(new Vector(RandomGen.NextInt(-100, 400), RandomGen.NextInt(800, 1600)));
+                    }
+
+                    if (RandomGen.NextInt(1, 15) == 1)
+                    {
+                        PhysicsObject Pigeon = PhysicsObject.CreateStaticObject(49, 35);
+                        Pigeon.X = Camera.ScreenToWorld(new Vector(Screen.Left, 0)).X;
+                        Pigeon.Y = pelaaja1.Y + 50;
+                        Pigeon.LifetimeLeft = TimeSpan.FromSeconds(5);
+                        Pigeon.Image = Lintu;
+                        Pigeon.IgnoresCollisionResponse = true;
+                        Pigeon.Tag = "vihu";
+                        Pigeon.Velocity = new Vector(500, 0);
+                        Add(Pigeon);
+                    }
                 }
-                if (RandomGen.NextInt(1, 20) == 1)
+
+                if (RandomGen.NextInt(1, 3) == 1)
                 {
-                    PhysicsObject Helichopter = PhysicsObject.CreateStaticObject(32, 32);
-                    Helichopter.X = taso.X + RandomGen.NextInt(40, 100);
-                    Helichopter.Y = 340;
-                    Helichopter.Image = HeliChapter;
-                    PlasmaCannon HeliChopterAse = new PlasmaCannon(30, 10);
-                    HeliChopterAse.Angle += Angle.FromDegrees(RandomGen.NextInt(-125, -25));
-                    Timer Asetimer = new Timer();
-                    Asetimer.Interval = 1;
-                    Asetimer.Timeout += delegate
-                    {
-                        PhysicsObject HeliAmmus = HeliChopterAse.Shoot();
-                        HeliAmmus.Tag = "vihu";
-                        HeliAmmus.LifetimeLeft = TimeSpan.FromSeconds(0.8);
-                        AddCollisionHandler(HeliAmmus, CollisionHandler.DestroyObject);
-                    };
-                    Asetimer.Start();
-                    Helichopter.Add(HeliChopterAse);
-                    Helichopter.IgnoresCollisionResponse = true;
-                    Helichopter.Tag = "HeliTag";
-                    Add(Helichopter);
-
-                    Helichopter.Destroyed += Asetimer.Stop;
-                    Helichopter.Destroyed += HeliChopterAse.Destroy;
+                    PhysicsObject wumpaf = PhysicsObject.CreateStaticObject(32, 32);
+                    wumpaf.X = (taso.X + RandomGen.NextInt(50, 100));
+                    wumpaf.Y = taso.Y + RandomGen.NextInt(50, 200);
+                    wumpaf.Image = WumpaFruit;
+                    wumpaf.Tag = "wumpa";
+                    wumpaf.IgnoresCollisionResponse = true;
+                    Add(wumpaf);
                 }
-                if (RandomGen.NextInt(1, 10) == 1)
+
+                if (RandomGen.NextInt(1, 25) == 1)
                 {
-                    PhysicsObject LaavaPallo = new PhysicsObject(32, 32, Shape.Circle);
-                    LaavaPallo.X = pelaaja1.X;
-                    LaavaPallo.Y = Level.Bottom;
-                    LaavaPallo.Image = FireLava;
-                    LaavaPallo.Tag = "vihu";
-                    LaavaPallo.IgnoresCollisionResponse = true;
-                    Add(LaavaPallo);
-                    LaavaPallo.Hit(new Vector(RandomGen.NextInt(-100,400), RandomGen.NextInt(800,1600)));
+                    PhysicsObject Health = PhysicsObject.CreateStaticObject(32, 32);
+                    Health.X = (taso.X + RandomGen.NextInt(50, 100));
+                    Health.Y = taso.Y + RandomGen.NextInt(50, 200);
+                    Health.IgnoresCollisionResponse = true;
+                    Health.Image = Sydan;
+                    Health.Tag = "Heal";
+                    Add(Health);
                 }
-
-                if (RandomGen.NextInt(1, 15) == 1)
-                {
-                    PhysicsObject Pigeon = PhysicsObject.CreateStaticObject(49, 35);
-                    Pigeon.X = Camera.ScreenToWorld(new Vector(Screen.Left, 0)).X;
-                    Pigeon.Y = pelaaja1.Y + 50;
-                    Pigeon.LifetimeLeft = TimeSpan.FromSeconds(5);
-                    Pigeon.Image = Lintu;
-                    Pigeon.IgnoresCollisionResponse = true;
-                    Pigeon.Tag = "vihu";
-                    Pigeon.Velocity = new Vector(500, 0);
-                    Add(Pigeon);
-                }
-            }
-
-            if (RandomGen.NextInt(1, 3) == 1)
-            {
-                PhysicsObject wumpaf = PhysicsObject.CreateStaticObject(32, 32);
-                wumpaf.X = (taso.X + RandomGen.NextInt(50, 100));
-                wumpaf.Y = taso.Y + RandomGen.NextInt(50, 200);
-                wumpaf.Image = WumpaFruit;
-                wumpaf.Tag = "wumpa";
-                wumpaf.IgnoresCollisionResponse = true;
-                Add(wumpaf);
-            }
-
-            if (RandomGen.NextInt(1, 25) == 1)
-            {
-                PhysicsObject Health = PhysicsObject.CreateStaticObject(32, 32);
-                Health.X = (taso.X + RandomGen.NextInt(50, 100));
-                Health.Y = taso.Y + RandomGen.NextInt(50, 200);
-                Health.IgnoresCollisionResponse = true;
-                Health.Image = Sydan;
-                Health.Tag = "Heal";
-                Add(Health);
-            }
-
+            }
+
+            else if (RandomGen.NextInt(1, 7) == 1)
+            {
+                Boost boost = new Boost(64, 42, this.etenemisVauhtiMittari);
+                boost.LifetimeLeft = TimeSpan.FromSeconds(15.0);
+                boost.X = RandomGen.NextInt(50, 100) + vanhaTaso;
+                boost.Y = RandomGen.NextInt(-200, 75);
+                boost.Color = Color.Green;
+                boost.Velocity = new Vector(etenemisVauhtiMittari.Value, 0);
+                boost.CollisionIgnoreGroup = 1;
+                vanhaTaso = boost.X;
+                Add(boost);
+            }
+
+            else
+            {
+                PhysicsObject TuhoutuvaTaso = PhysicsObject.CreateStaticObject(82, 20);
+                TuhoutuvaTaso.X = RandomGen.NextInt(150, 325) + vanhaTaso;
+                TuhoutuvaTaso.Y = RandomGen.NextInt(-200, 75);
+                TuhoutuvaTaso.Color = Color.Red;
+                TuhoutuvaTaso.Oscillate(Vector.UnitY, RandomGen.NextInt(50, 200), 0.5);
+                vanhaTaso = TuhoutuvaTaso.X;
+                TuhoutuvaTaso.Tag = "TTaso";
+                TuhoutuvaTaso.CollisionIgnoreGroup = 1;
+                Add(TuhoutuvaTaso);
+            }
         }
-        else
-        {
-            PhysicsObject TuhoutuvaTaso = PhysicsObject.CreateStaticObject(82, 20);
-            TuhoutuvaTaso.X = RandomGen.NextInt(150, 325) + VanhaTaso;
-            TuhoutuvaTaso.Y = RandomGen.NextInt(-200, 75);
-            TuhoutuvaTaso.Color = Color.Red;
-            TuhoutuvaTaso.Oscillate(Vector.UnitY, RandomGen.NextInt(50, 200), 0.5);
-            VanhaTaso = TuhoutuvaTaso.X;
-            TuhoutuvaTaso.Tag = "TTaso";
-            Add(TuhoutuvaTaso);
-        }
+
     }