Changeset 5019 for 2014/24

Timestamp:

2014-06-13 11:07:21 (6 years ago)

Author:

noaialha

Message:

 

Location:

2014/24/NooraH/Diamond

Files:

• Diamond.suo (modified) (previous)
• Diamond/Diamond/Diamond.cs (modified) (15 diffs)
• Diamond/Diamond/bin/x86/Debug/Content/Diamond.xnb (modified) (previous)
• Diamond/Diamond/bin/x86/Debug/Content/kentta1.xnb (modified) (previous)
• Diamond/Diamond/bin/x86/Debug/Content/maali.xnb (modified) (previous)
• Diamond/Diamond/bin/x86/Debug/Diamond.exe (modified) (previous)
• Diamond/Diamond/bin/x86/Debug/Diamond.pdb (modified) (previous)
• Diamond/Diamond/obj/x86/Debug/ContentPipeline-{1A7E25CE-F3A7-4CC7-9EF9-562C53D5D0D2}.xml (modified) (3 diffs)
• Diamond/Diamond/obj/x86/Debug/Diamond.exe (modified) (previous)
• Diamond/Diamond/obj/x86/Debug/Diamond.pdb (modified) (previous)
• Diamond/DiamondContent/Diamond.png (modified) (previous)
• Diamond/DiamondContent/Maali.png (modified) (previous)
• Diamond/DiamondContent/kentta1.txt (modified) (2 diffs)

2014/24/NooraH/Diamond/Diamond/Diamond/Diamond.cs

@@ -14 +14 @@
 
     PlatformCharacter pelaaja1;
+    PlatformCharacter pelaaja2;
 
     Image pelaajanKuva = LoadImage("Hahmo1");
@@ -19 +20 @@
     Image pahiskuva = LoadImage("Pahis");
     Image hahmokuva;
+    Image hahmokuva2;
     Image Siilikuva = LoadImage("Siili");
     Image Piikki = LoadImage("Piikki");
+    Image Maalikuva = LoadImage("Maali");
 
     Image[] hahmokuvat = LoadImages("Hympi", "Hahmo2", "Pink", "häntukka", "Muvail");
@@ -28 +31 @@
     IntMeter pisteLaskuri;
 
+    int pelaajienMaara;
+
     public override void Begin()
+    {
+        LuoAlkuvalikko();
+        
+    }
+
+    void LuoAlkuvalikko()
     {
         MultiSelectWindow alkuValikko = new MultiSelectWindow("Pelin alkuvalikko", "Aloita peli", "Lopeta");
         Add(alkuValikko);
-        alkuValikko.AddItemHandler(0, ValitseHahmo);
+        alkuValikko.AddItemHandler(0, ValitsePelaajienMaara);
         alkuValikko.AddItemHandler(1, Exit);
     }
 
+    void ValitsePelaajienMaara()
+    {
+        MultiSelectWindow alkuValikko = new MultiSelectWindow("Valitse pelaajien määrä", "1 pelaaja", "2 pelaajaa");
+        Add(alkuValikko);
+        alkuValikko.AddItemHandler(0, delegate { pelaajienMaara = 1; ValitseHahmo(); });
+        alkuValikko.AddItemHandler(1, delegate { pelaajienMaara = 2; ValitseHahmo(); });
+    }
+
     void ValitseHahmo()
     {
-        MultiSelectWindow hahmoValikko = new MultiSelectWindow("Valitse Hahmo", "Hympi ", "Korsi", "Pink", "häntukka", "Muvail");
+        MultiSelectWindow hahmoValikko = new MultiSelectWindow("Valitse ensimmäisen pelaajan hahmo", "Hympi ", "Korsi", "Pink", "häntukka", "Muvail");
         Add(hahmoValikko);
 
@@ -50 +69 @@
             {
                 hahmokuva = hahmokuvat[indeksi];
+
+                if (pelaajienMaara == 2) ValitseHahmo2();
+                else AloitaPeli();
+            });
+        }
+    }
+
+    void ValitseHahmo2()
+    {
+        MultiSelectWindow hahmoValikko = new MultiSelectWindow("Valitse toisen pelaajan hahmo", "Hympi ", "Korsi", "Pink", "häntukka", "Muvail");
+        Add(hahmoValikko);
+
+        for (int i = 0; i < hahmokuvat.Length; i++)
+        {
+            int indeksi = i;
+            hahmoValikko.Buttons[i].Image = hahmokuvat[i];
+            hahmoValikko.Buttons[i].TextScale *= 3;
+            hahmoValikko.Buttons[i].TextColor = Color.Red;
+            hahmoValikko.AddItemHandler(indeksi, delegate
+            {
+                hahmokuva2 = hahmokuvat[indeksi];
                 AloitaPeli();
             });
@@ -62 +102 @@
         LisaaNappaimet();
 
-        Camera.Follow(pelaaja1);
+        if (pelaajienMaara == 1) Camera.Follow(pelaaja1);
+        else Camera.Follow(pelaaja1, pelaaja2);
         Camera.ZoomFactor = 2.5;
         Camera.StayInLevel = true;
@@ -76 +117 @@
         kentta.SetTileMethod('*', LisaaDiamond);
         kentta.SetTileMethod('N', LisaaPelaaja);
+        kentta.SetTileMethod('n', LisaaPelaaja2);
         kentta.SetTileMethod('P', LisaaPahis);
         kentta.SetTileMethod('u', LisaaTaso5);
@@ -86 +128 @@
         kentta.Execute(RUUDUN_KOKO, RUUDUN_KOKO);
         Level.CreateBorders();
-        Level.Background.CreateGradient(Color.White, Color.SkyBlue);
+        Level.Background.CreateGradient(Color.Gray, Color.LightGray);
     }
 
@@ -121 +163 @@
     void LisaaDiamond(Vector paikka, double leveys, double korkeus)
     {
-        PhysicsObject tahti = PhysicsObject.CreateStaticObject(leveys * 0.5, korkeus * 0.5);
+        PhysicsObject tahti = PhysicsObject.CreateStaticObject(leveys * 0.5, korkeus * 0.7);
         tahti.IgnoresCollisionResponse = true;
         tahti.Position = paikka;
@@ -142 +184 @@
     }
 
+    void LisaaPelaaja2(Vector paikka, double leveys, double korkeus)
+    {
+        if (pelaajienMaara == 1) return;
+
+        pelaaja2 = new PlatformCharacter(leveys - 2, korkeus - 2);
+        pelaaja2.Position = paikka;
+        pelaaja2.Mass = 4.0;
+        pelaaja2.Image = hahmokuva2;
+        AddCollisionHandler(pelaaja2, "Diamond", TormaaTahteen);
+        AddCollisionHandler(pelaaja2, "vaara", PelaajaKuolee);
+        AddCollisionHandler(pelaaja2, "painovoima", painovoimamuuttuu);
+        AddCollisionHandler(pelaaja2, "Maali", TormaaMaaliin);
+        Add(pelaaja2);
+    }
+
     void LisaaNappaimet()
     {
@@ -152 +209 @@
         Keyboard.Listen(Key.Down, ButtonState.Pressed, Hyppaaalas, "Pelaaja hyppää alas", pelaaja1, hyppyNopeus);
 
+        Keyboard.Listen(Key.A, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja2, -nopeus);
+        Keyboard.Listen(Key.D, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja2, nopeus);
+        Keyboard.Listen(Key.W, ButtonState.Pressed, Hyppaa, "Pelaaja hyppää", pelaaja2, hyppyNopeus);
+        Keyboard.Listen(Key.S, ButtonState.Pressed, Hyppaaalas, "Pelaaja hyppää alas", pelaaja2, hyppyNopeus);
+
         ControllerOne.Listen(Button.Back, ButtonState.Pressed, Exit, "Poistu pelistä");
 
@@ -157 +219 @@
         ControllerOne.Listen(Button.DPadRight, ButtonState.Down, Liikuta, "Pelaaja liikkuu oikealle", pelaaja1, nopeus);
         ControllerOne.Listen(Button.A, ButtonState.Pressed, Hyppaa, "Pelaaja hyppää", pelaaja1, hyppyNopeus);
+        ControllerOne.Listen(Button.B, ButtonState.Pressed, Hyppaaalas, "Pelaaja hyppääalas", pelaaja1, hyppyNopeus);
 
         PhoneBackButton.Listen(ConfirmExit, "Lopeta peli");
@@ -235 +298 @@
 
         Label pisteNaytto = new Label();
-        pisteNaytto.X = Screen.Left + 100;
+        pisteNaytto.X = Screen.Right - 150;
         pisteNaytto.Y = Screen.Top - 100;
-        pisteNaytto.TextColor = Color.Fuchsia;
-        pisteNaytto.Color = Color.Snow;
+        pisteNaytto.TextColor = Color.LightBlue;
+        pisteNaytto.Color = Color.LightCyan;
         pisteNaytto.IntFormatString = "Timanttia: {0:D1}";
         pisteNaytto.TextScale = new Vector(1.6, 1.6);
@@ -251 +314 @@
         Maali.Position = paikka;
         Maali.Tag = "Maali";
-        //Maali.Image = kuva;
+        Maali.Image = Maalikuva;
         Maali.Color = Color.Teal;
         Add(Maali);
@@ -259 +322 @@
     {
         ClearAll();
-        Label Teksti = new Label("Läpäisit pelin");
-        Teksti.TextColor = Color.HotPink;
+        Label Teksti = new Label("Läpäisit pelin!");
+        Teksti.TextColor = Color.Blue;
         Add(Teksti);
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
         Teksti.TextScale = new Vector(5, 5);
+        Level.Background.Color = Color.Black;
     }
     void LisaaSiili(Vector paikka, double leveys, double korkeus)
@@ -274 +338 @@
         Pahis.Tag = "vaara";
         Timer ajastin = new Timer();
-        ajastin.Interval = 1.2;
+        ajastin.Interval = RandomGen.NextDouble(1.6,3);
         ajastin.Timeout += delegate
         {
-            Pahis.Jump(650);
+            Pahis.Jump(800);
         };
         ajastin.Start();

2014/24/NooraH/Diamond/Diamond/Diamond/obj/x86/Debug/ContentPipeline-{1A7E25CE-F3A7-4CC7-9EF9-562C53D5D0D2}.xml

@@ -9 +9 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\Diamond.xnb</Output>
-      <Time>2014-06-11T10:03:36.9747274+03:00</Time>
+      <Time>2014-06-13T09:38:34.1080082+03:00</Time>
     </Item>
     <Item>
@@ -36 +36 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\kentta1.xnb</Output>
-      <Time>2014-06-12T14:53:50.906779+03:00</Time>
+      <Time>2014-06-13T10:40:26.7648616+03:00</Time>
     </Item>
     <Item>
@@ -144 +144 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\Maali.xnb</Output>
-      <Time>2014-06-12T13:14:12.8835593+03:00</Time>
+      <Time>2014-06-13T09:42:01.6592192+03:00</Time>
     </Item>
     <Item>

2014/24/NooraH/Diamond/Diamond/DiamondContent/kentta1.txt

@@ -5 +5 @@
 t                                                                                                                            *****   T
 t ss                                                                                                                         *****   T
-tTTT                               P             ** S **       p         P      *******                                    ttttt  Tt         
+tTTT                               P             ** S **       p         P      *******                                      ttttt  Tt         
 t                            TTTTTtTTTT  t  t  ttttTTTtTttt  Tttt   TtTTttttttTt tTTt   ttt                                        ttt
      T                      tRRRrrRrRrt        tRRrrrrrrrrt  tTTt   TTtTttttttt   TTt   Tttt                                     Ttttt
-    t        P *******     trrrrrrrrRRt        tRRrrRrrRrrt                                         P * P * S * P * P           TttTtt
+    tn N      P *******    trrrrrrrrRRt        tRRrrRrrRrrt                                         S * P * S * P * S           TttTtt
 T  tTTTTTTTTTTTTTTTTTTTTTTTrRRrrRRrRRRt        tRrrrrrrRRRT                                     tTTttttttTTtTttTttttTtttt   ttTttttTtT  
 rt  tTtttttttTTTTTtttttttttTttttttttttt        tRrRrRrrRRRT                                   ttRRRRRRRRRrrrrrrrrrrrrrrrt            T
-RRt                         *****   **         tRrrrRRrrrrt       P  ********   S    P      tttTRRRRRRrrrrrrrrRRrrrrrrrrT            t
+RRt            *          ***   **       S  S  tRrrrRRrrrrt       P  ********   S     P     tttTRRRRRRrrrrrrrrRRrrrrrrrrT            t
 RrttttttttttttTTTTtttTtTttTttttttttTTtttttttttttRRrrrRrRrRttttttttttttttttTttttttTtttttttttTTTTTTttttttttTtttttTttTtttttT            t
 TRRRRRRRRRRRRrrrrrrrrrrrrrrrrrrrRRRrrrRrrrrrrrrrRRrrrRrrRrrrrrrRRRRrrRRRrRrrrRrrrRrrrRrrrrrrrrrRRRRRRRRRRrrrrrrrRrrrRrrRt            t
@@ -17 +17 @@
 tRrrrRRrrrrrrrrRRRRRRrrrrrrrrrrrrrrrrrRRRRrrrRrrrrrrrrRRrrRRRrRrRrRRRRRRRRRRRRRRRRRrrrrrrrrrrrrrrrrrrrRRRRrrRrrrrrrRrrrrT            T
 TTTTTttttttttttttTTtTttttTTTTTTTttttttTTTTTtttTTTTttttTTTTtttttttTTTtttTTTttTtTTtTtTttTttttttTTtttttttTtTTtTtTtTttttttTTT            t
-M   T  T   t                   *      t     tt           tt                 ttt                 tt          t     t     u            t
-M   t                t             tt             t          **                     tt                     t            u  **** N    T
-M    **     T                        **   tttttIIIIIIIII             t          tIIIIIIIIIIIIIIIII Tt      t            u s s s s P  t
-TTtTTTttttttt   I  tTtt       ttttttttttttTTTTTTTttttttttttttTTtTTtTTtttttttTTTTTTTtTtTtttTtttTTttTtttTTttttttTTttTTTtttttttTtTTtTtttt
+M   T  T   tt             T    *      t     tt           tt         t       ttt                 tt          t     t     u            t
+M   t       T        t    T    T   tt             t          **                     tt                                  u  ****      T
+M    **t            t    t    T     **   tttttIIIIIIIII       T     t          tIIIIIIIIIIIIIIIII TtIIIIIIt             u s s s s P  t
+TTtTTTtttttttIIIIItTtt        ttttttttttttTTTTTTTttttttttttttTTtTTtTTtttttttTTTTTTTtTtTtttTtttTTttTtttTTttttttTTttTTTtttttttTtTTtTtttt
 RRrrrRrrrrrrtttttttttttttttttttRRrrrrRRRRrrRRRRrrrRRRrrrrRRRttttttttttttRRRrrrRrrRRrrRRRrrRrrrRrRrRrrRRrrrrRrrrRRRrRRrrrrRRRrrRRRrrrRr