Changeset 5579 for 2014

Timestamp:

2014-07-23 12:36:58 (9 years ago)

Author:

eemalisa

Message:

 

Location:

2014/30/EevaS

Files:

• Pelaaja.png (added)
• Pong/Pong.suo (modified) (previous)
• Pong/Pong/Pong/Pong.cs (modified) (5 diffs)
• Pong/Pong/Pong/bin/x86/Debug/Pong.exe (modified) (previous)
• Pong/Pong/Pong/bin/x86/Debug/Pong.pdb (modified) (previous)
• Pong/Pong/Pong/obj/x86/Debug/Pong.exe (modified) (previous)
• Pong/Pong/Pong/obj/x86/Debug/Pong.pdb (modified) (previous)
• Untitled.png (added)
• Zombie attack! (added)
• Zombie attack!/Zombie attack! (added)
• Zombie attack!/Zombie attack!.sln (added)
• Zombie attack!/Zombie attack!.suo (added)
• Zombie attack!/Zombie attack!/Zombie attack! (added)
• Zombie attack!/Zombie attack!/Zombie attack!/Game.ico (added)
• Zombie attack!/Zombie attack!/Zombie attack!/GameThumbnail.png (added)
• Zombie attack!/Zombie attack!/Zombie attack!/Ohjelma.cs (added)
• Zombie attack!/Zombie attack!/Zombie attack!/Properties (added)
• Zombie attack!/Zombie attack!/Zombie attack!/Properties/AssemblyInfo.cs (added)
• Zombie attack!/Zombie attack!/Zombie attack!/Zombie attack!.csproj (added)
• Zombie attack!/Zombie attack!/Zombie attack!/Zombie_attack_.cs (added)
• Zombie attack!/Zombie attack!/Zombie attack!/bin (added)
• Zombie attack!/Zombie attack!/Zombie attack!/bin/x86 (added)
• Zombie attack!/Zombie attack!/Zombie attack!/bin/x86/Debug (added)
• Zombie attack!/Zombie attack!/Zombie attack!/bin/x86/Debug/Jypeli.dll (added)
• Zombie attack!/Zombie attack!/Zombie attack!/bin/x86/Debug/Jypeli.xml (added)
• Zombie attack!/Zombie attack!/Zombie attack!/bin/x86/Debug/Zombie attack!.exe (added)
• Zombie attack!/Zombie attack!/Zombie attack!/bin/x86/Debug/Zombie attack!.pdb (added)
• Zombie attack!/Zombie attack!/Zombie attack!/bin/x86/Release (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj/x86 (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj/x86/Debug (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj/x86/Debug/Microsoft.Xna.Framework.RuntimeProfile.txt (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj/x86/Debug/TempPE (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj/x86/Debug/Zombie attack!.csproj.FileListAbsolute.txt (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj/x86/Debug/Zombie attack!.csprojResolveAssemblyReference.cache (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj/x86/Debug/Zombie attack!.exe (added)
• Zombie attack!/Zombie attack!/Zombie attack!/obj/x86/Debug/Zombie attack!.pdb (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/Kenttä.png (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/Pelaaja.png (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/Zombie attack!Content.contentproj (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/bin (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/bin/x86 (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/bin/x86/Debug (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/obj (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/obj/x86 (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/obj/x86/Debug (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (added)
• Zombie attack!/Zombie attack!/Zombie attack!Content/obj/x86/Debug/TempPE (added)

2014/30/EevaS/Pong/Pong/Pong/Pong.cs

@@ -13 +13 @@
     
     PhysicsObject pallo;
-
     PhysicsObject maila1;
     PhysicsObject maila2;
+
+    PhysicsObject vasenReuna;
+    PhysicsObject oikeaReuna;
+    
+    IntMeter pelaajan1Pisteet;
+    IntMeter pelaajan2Pisteet;
 
     public override void Begin()
@@ -21 +26 @@
         LuoKentta();
         AsetaOhjaimet();
+        LisaaLaskurit();
         AloitaPeli();
     }
@@ -34 +40 @@
         maila2 = LuoMaila(Level.Right - 20.0, 0.0);
         
-        Level.CreateBorders(1.0, false);
+        vasenReuna = Level.CreateLeftBorder();
+        vasenReuna.Restitution = 1.0;
+        vasenReuna.IsVisible = false;
+
+        oikeaReuna = Level.CreateRightBorder();
+        oikeaReuna.Restitution = 1.0;
+        oikeaReuna.IsVisible = false;
+
+        PhysicsObject alareuna = Level.CreateBottomBorder();
+        alareuna.Restitution = 1.0;
+        alareuna.IsVisible = false;
+
+        PhysicsObject ylareuna = Level.CreateTopBorder();
+        ylareuna.Restitution = 1.0;
+        ylareuna.IsVisible = false;
+
         Level.Background.Color = Color.Black;
         
         Camera.ZoomToLevel();
+
+        AddCollisionHandler(pallo, KasittelePallonTormays);
     }
 
@@ -71 +94 @@
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
+
+        ControllerOne.Listen(Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös", maila1, nopeusYlos);
+        ControllerOne.Listen(Button.DPadUp, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
+        ControllerOne.Listen(Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas", maila1, nopeusAlas);
+        ControllerOne.Listen(Button.DPadDown, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
+
+        ControllerTwo.Listen(Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös", maila2, nopeusYlos);
+        ControllerTwo.Listen(Button.DPadUp, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
+        ControllerTwo.Listen(Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas", maila2, nopeusAlas);
+        ControllerTwo.Listen(Button.DPadDown, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
+
+        ControllerOne.Listen(Button.Back, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
+        ControllerTwo.Listen(Button.Back, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
     }
 
     void AsetaNopeus(PhysicsObject maila, Vector nopeus)
     {
-        if (maila.Top > Level.Top)
+        if ((nopeus.Y < 0) && (maila.Bottom < Level.Bottom))
+        {
+            maila.Velocity = Vector.Zero;
+            return;
+        }
+        
+        if ((nopeus.Y > 0) && (maila.Top > Level.Top))
         {
             maila.Velocity = Vector.Zero;
@@ -84 +126 @@
     }
 
+    void LisaaLaskurit()
+    {
+        pelaajan1Pisteet = LuoPisteLaskuri(Screen.Left + 100.0, Screen.Top - 100.0);
+        pelaajan2Pisteet = LuoPisteLaskuri(Screen.Right - 100.0, Screen.Top - 100.0);
+    }
 
+    IntMeter LuoPisteLaskuri(double x, double y)
+    {
+        IntMeter laskuri = new IntMeter(0);
+        laskuri.MaxValue = 10;
+        Label naytto = new Label();
+        naytto.BindTo(laskuri);
+        naytto.X = x;
+        naytto.Y = y;
+        naytto.TextColor = Color.White;
+        naytto.BorderColor = Level.Background.Color;
+        Add(naytto);
+        
+        return laskuri;
+    }
 
+    void KasittelePallonTormays(PhysicsObject pallo, PhysicsObject kohde)
+    {
+        if (kohde == oikeaReuna)
+        {
+            pelaajan1Pisteet.Value += 1;
+        }
+        else if (kohde == vasenReuna)
+        {
+            pelaajan2Pisteet.Value += 1;
+        }
+    }
 
 }