Changeset 4437 for 2013/27/JoonasM/RnGPlatformShooter/RnGPlatformShooter

Timestamp:

2013-07-04 15:01:23 (10 years ago)

Author:

joarmuho

Message:

Talletus.

Location:

2013/27/JoonasM/RnGPlatformShooter/RnGPlatformShooter

Files:

• RnGPlatformShooter/RnGPlatformShooter.cs (modified) (14 diffs)
• RnGPlatformShooterContent/Heart.png (added)
• RnGPlatformShooterContent/Pigeon.png (added)
• RnGPlatformShooterContent/RnGPlatformShooterContent.contentproj (modified) (1 diff)
• RnGPlatformShooterContent/Sun.png (added)

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

@@ -23 +23 @@
     Image HeliChapter = LoadImage("Helipad");
     Image FireLava = LoadImage("Fireball");
+    Image Solar = LoadImage("Sun");
+    Image Sydan = LoadImage("Heart");
+    Image Lintu = LoadImage("Pigeon");
 
     IntMeter pisteLaskuri;
+    IntMeter Enu;
+    IntMeter Wumpat;
 
     SoundEffect maaliAani = LoadSoundEffect("maali");
@@ -32 +37 @@
     public override void Begin()
     {
+        Label tekstikentta = new Label("RnGPlatformShooter");
+        tekstikentta.Font = Font.DefaultLarge;
+        tekstikentta.X = 0;
+        tekstikentta.Y = Level.Top - 50;
+        Add(tekstikentta);
+
         MultiSelectWindow alkuValikko = new MultiSelectWindow("Pelin alkuvalikko", "Aloita peli", "High Score", "Lopeta");
         alkuValikko.AddItemHandler(0, StartGame);
@@ -41 +52 @@
     void StartGame()
     {
+        ClearAll();
         Gravity = new Vector(0, -1500);
 
@@ -53 +65 @@
     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;
         PhysicsObject StartingPlatform = PhysicsObject.CreateStaticObject(80, 20);
@@ -59 +78 @@
         Add(StartingPlatform);
         pisteLaskuri = new IntMeter(0);
+        Enu = new IntMeter(1);
+        Wumpat = new IntMeter(0);
+        
         LisaaPelaaja();
 
@@ -69 +91 @@
             pisteLaskuri.Value += 1;
 
-            if (Camera.Velocity.X < 210)
+            if (Camera.Velocity.X < 190)
             {
                 Camera.Velocity *= 1.05;
+                SolarS.Velocity *= 1.05;
             }
             
@@ -83 +106 @@
                 HighScore();
             }
+            if (Wumpat > 10)
+            {
+                Wumpat.Value -= 10;
+                Enu.Value += 2;
+            }
 
         };
         Ajastin.Start();
 
-        
-        
         Label pisteNaytto = new Label();
-        pisteNaytto.X = Screen.Right - 100;
+        pisteNaytto.X = Screen.Left + 100;
         pisteNaytto.Y = Screen.Top - 100;
         pisteNaytto.TextColor = Color.Black;
         pisteNaytto.Color = Color.White;
         pisteNaytto.Title = "Pisteet";
-
         pisteNaytto.BindTo(pisteLaskuri);
         Add(pisteNaytto);
+
+        Label ElamaMeter = new Label();
+        ElamaMeter.X = Screen.Left + 100;
+        ElamaMeter.Y = Screen.Top - 150;
+        ElamaMeter.TextColor = Color.Black;
+        ElamaMeter.Color = Color.White;
+        ElamaMeter.Title = "Elämät";
+        ElamaMeter.BindTo(Enu);
+        Add(ElamaMeter);
+        
+        Label WumpaMeter = new Label();
+        WumpaMeter.X = Screen.Left + 100;
+        WumpaMeter.Y = Screen.Top - 200;
+        WumpaMeter.TextColor = Color.Black;
+        WumpaMeter.Color = Color.White;
+        WumpaMeter.Title = "Wumpat";
+        WumpaMeter.BindTo(Wumpat);
+        Add(WumpaMeter);
     }
 
@@ -104 +147 @@
         if (RandomGen.NextInt(1, 10) != 1)
         {
-            PhysicsObject taso = PhysicsObject.CreateStaticObject(64, 20);
-            taso.X = RandomGen.NextInt(150, 325) + VanhaTaso;
+            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(75, 250), 0.5);
+            taso.Oscillate(Vector.UnitY, RandomGen.NextInt(85, 250), 0.5);
             VanhaTaso = taso.X;
+            taso.MakeOneWay();
             Add(taso);
 
             if (ensimmainenKerta == false)
             {
-                if (RandomGen.NextInt(1, 7) == 1)
+                if (RandomGen.NextInt(1, 6) == 1)
                 {
                     PhysicsObject vihu = PhysicsObject.CreateStaticObject(32, 32);
@@ -159 +203 @@
                     LaavaPallo.IgnoresCollisionResponse = true;
                     Add(LaavaPallo);
-                    LaavaPallo.Hit(new Vector(RandomGen.NextInt(-100,300), RandomGen.NextInt(800,1800)));
+                    LaavaPallo.Hit(new Vector(RandomGen.NextInt(-100,400), RandomGen.NextInt(800,1600)));
                 }
-            }
-
-            if (RandomGen.NextInt(1, 10) == 1)
+
+                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);
@@ -172 +229 @@
                 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);
             }
 
@@ -198 +266 @@
         pelaaja1.Add(pelaajan1Ase);
         AddCollisionHandler(pelaaja1, "wumpa", CollisionHandler.DestroyTarget);
-        AddCollisionHandler(pelaaja1, "wumpa", CollisionHandler.AddMeterValue(pisteLaskuri, 50));
+        AddCollisionHandler(pelaaja1, "Heal", CollisionHandler.DestroyTarget);
+        AddCollisionHandler(pelaaja1, "Heal", CollisionHandler.AddMeterValue(Enu, 1));
+        AddCollisionHandler(pelaaja1, "wumpa", CollisionHandler.AddMeterValue(pisteLaskuri, 10));
+        AddCollisionHandler(pelaaja1, "wumpa", CollisionHandler.AddMeterValue(Wumpat, 1));
         AddCollisionHandler(pelaaja1, "vihu", TormaysHighScore);
         AddCollisionHandler(pelaaja1, "TTaso", TuhoaTaso);
@@ -206 +277 @@
     void TuhoaTaso(PhysicsObject tormaaja, PhysicsObject objekti)
     {
-        //Timer TasoAjastin = new Timer();
         Timer.SingleShot(1.5, delegate {
             if (!objekti.IsDestroyed)
@@ -216 +286 @@
             }
         });
-        //TasoAjastin.Start();
     }
 
@@ -267 +336 @@
     void TormaysHighScore(PhysicsObject Tormaaja, PhysicsObject Kohde)
     {
-        HighScore();
+        if (Enu < 1)
+        {
+            HighScore();
+        }
+        else
+        {
+            Enu.Value -= 1;
+            CollisionHandler.DestroyTarget(Tormaaja, Kohde);
+        }
     }
 

2013/27/JoonasM/RnGPlatformShooter/RnGPlatformShooter/RnGPlatformShooterContent/RnGPlatformShooterContent.contentproj

@@ -83 +83 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Sun.png">
+      <Name>Sun</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Heart.png">
+      <Name>Heart</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Pigeon.png">
+      <Name>Pigeon</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.