Changeset 2873 for 2012/23

Timestamp:

2012-06-08 11:05:28 (9 years ago)

Author:

hasamati

Message:

 

Location:

2012/23/HannesM

Files:

• Pong/Pong/Pong/Pong.cs (modified) (1 diff)
• The Game of Rooms/The Game of Rooms/The Game of Rooms/The_Game_of_Rooms.cs (modified) (10 diffs)

2012/23/HannesM/Pong/Pong/Pong/Pong.cs

@@ -9 +9 @@
 public class Pong : PhysicsGame
 {
-    Vector nopeusYlos = new Vector(0, 200);
-    Vector nopeusAlas = new Vector(0, -200);
+    Vector nopeusYlos = new Vector(0, 300);
+    Vector nopeusAlas = new Vector(0, -300);
     
     PhysicsObject pallo;

2012/23/HannesM/The Game of Rooms/The Game of Rooms/The Game of Rooms/The_Game_of_Rooms.cs

@@ -12 +12 @@
     PlatformCharacter pelaaja;
     bool onTikkaat = false;
-    DoubleMeter ammusmittari;
+    IntMeter AmmusLaskuri;
     
     public override void Begin()
@@ -55 +55 @@
         ruudut.Execute();
 
+        Laskuri();
+
         Level.BackgroundColor = Color.White;
 
@@ -93 +95 @@
         AddCollisionHandler(pelaaja, "pöö", PelaajaAuts);
         AddCollisionHandler(pelaaja, "Enu", Elamapakki);
+        AddCollisionHandler(pelaaja, "Ammuu", ammusPakki);
 
         Keyboard.Listen(Key.A, ButtonState.Down,
@@ -298 +301 @@
         vihu.Shape = Shape.Octagon;
         vihu.Image = LoadImage("The Room Enemy");
+        vihu.IgnoresGravity = true;
         vihu.Tag = "pöö";
 
@@ -320 +324 @@
         ammuspaketti.Shape = Shape.Diamond;
         ammuspaketti.Image = LoadImage("Ammuksia");
+        ammuspaketti.Tag = "Ammuu";
         Add(ammuspaketti);
     }
@@ -366 +371 @@
     void Ammu()
     {
+        if (AmmusLaskuri.Value < 1) return;
+
         Projectile ammus = new Projectile(4.0, 4.0, Color.Black);
         ammus.Y = pelaaja.Y + 9;
@@ -374 +381 @@
         AddCollisionHandler(ammus, ammuksentormays);
         Add(ammus);
+        AmmusLaskuri.Value--;
         Vector ase = new Vector(pelaaja.FacingDirection.Vector.X * 10000.0, 0.0);
         ammus.Hit(ase);
@@ -407 +415 @@
     }
 
-    void ammusmittari()
-    {
-        ammusMittari = new DoubleMeter(5);
-        ammusMittari.MaxValue = 5;
-        ProgressBar ammusMittari = new ProgressBar(100, 10);
-        ammusMittari.BindTo(ammusMittari);
-        Add(ammusMittari);
-
-        ammusPalkki.X = Screen.Left -100;
-        ammusPalkki.Y = Screen.Top + -100;
-        ammusPalkki.Angle = Angle.RightAngle;
-        ammusPalkki.BarColor = Color.Red;
-        ammusPalkki.BorderColor = Color.Black;
-        ammusPalkki.Angle = Angle.FromDegrees(90);
-        ammusMittari.LowerLimit += AmmuksetLoppui;
-    }
-
-    void VahennaAmmuksia()
-    {
-        ammusmittari.Value--;
-    }
-
-    void AmmuksetLoppui(double mittarinArvo)
-    {
-        MessageDisplay.Add("No more bullets!");
-    }
-
     void ElamaLoppui(double mittarinarvo)
     {
@@ -460 +441 @@
     }
 
+    void ammusPakki(PhysicsObject pelaaja, PhysicsObject Ammuu)
+    {
+        if (AmmusLaskuri.Value > 19) return;
+
+        AmmusLaskuri.Value = AmmusLaskuri.Value +3;
+        Ammuu.Destroy();
+    }
+
     void Laitakiipeaan()
     {
@@ -475 +464 @@
 
     }
+
+    void Laskuri()
+    {
+        AmmusLaskuri = new IntMeter(6, 0, 20);
+
+        Label ammusNaytto = new Label();
+        ammusNaytto.X = Screen.Left + 100;
+        ammusNaytto.Y = Screen.Top - 100;
+        ammusNaytto.TextColor = Color.White;
+        ammusNaytto.Color = Color.Red;
+
+        ammusNaytto.BindTo(AmmusLaskuri);
+        Add (ammusNaytto);
+    }
+
 }