Changeset 3397

Timestamp:

2012-06-29 12:21:04 (11 years ago)

Author:

mitokalu

Message:

Talletus.

Location:

2012/26/MikaL/Zombie Survival/Zombie Survival

Files:

• Zombie Survival/Zombie_Survival.cs (modified) (17 diffs)
• Zombie SurvivalContent/Zombie SurvivalContent.contentproj (modified) (1 diff)

2012/26/MikaL/Zombie Survival/Zombie Survival/Zombie Survival/Zombie_Survival.cs

@@ -24 +24 @@
         peli.rahaLaskuri.Value += 50;
         this.Destroy();
-        peli.SpawnaaZombi();
+        peli.SpawnAjastin();
+    }
+
+    public override void Update(Time time)
+    {
+        base.Update(time);
+        Angle = Velocity.Angle;
     }
 }
@@ -51 +57 @@
 
     DoubleMeter p1_hp;
+    DoubleMeter p2_hp;
 
 
@@ -77 +84 @@
         zombipaikat = new List<Vector>();
 
-        SetWindowSize(1024, 768, true);
+        SetWindowSize(1024, 768, false);
         if (DataStorage.Exists("scores.xml")) topLista = DataStorage.Load<ScoreList>(topLista, "scores.xml");
 
@@ -91 +98 @@
     void StartGame()
     {
+        //multiplayer.Value = 0;
         zombipaikat.Clear();
         ui();
         LuoMap();
         controls();
-        
                 LuoKillLaskuri();
                 LuoRahalaskuri();
@@ -135 +142 @@
     void LuoMap()
     {
-        SetWindowSize(1024, 768, false);
         ColorTileMap ruudut = ColorTileMap.FromLevelAsset("map");
         ruudut.SetTileMethod(Color.Black, TeeSeina);
@@ -147 +153 @@
         Level.Background.Image = lol;
         Camera.ZoomToLevel();
+        LuoZombi();
+        LuoZombi();
+        LuoZombi();
+
         
         
@@ -198 +208 @@
         ak2.Image = null;
         ak2.Color = Color.Transparent;
-        ak1.ProjectileCollision = AmmusOsui;
-        ak1.Ammo.Value = p1_lipas.Value;
+        ak2.ProjectileCollision = AmmusOsui;
+        ak2.Ammo.Value = p1_lipas.Value;
         p2.Add(ak2);
     }
-    public void SpawnaaZombi()
-    {
-        //Tee ajastin 
+    public void SpawnAjastin()
+    {
+        Timer ajastin = new Timer();
+        ajastin.Interval = 6.5;
+        ajastin.Timeout += LuoZombi;
+        ajastin.Start();
+
+        Timer ajastin2 = new Timer();
+        ajastin2.Interval = 30;
+        ajastin2.Timeout += LuoZombi;
+        ajastin2.Start();
+
     }
     void TeeZombiPaikka(Vector paikka, double leveys, double korkeus)
@@ -291 +310 @@
 
         ControllerOne.Listen(Button.Y, ButtonState.Pressed, Use, null, p2);
+        ControllerOne.Listen(Button.RightShoulder, ButtonState.Down, Shoot, null, p2);
+        ControllerOne.Listen(Button.X, ButtonState.Pressed, Reload, null, p2);
 
     }
@@ -331 +352 @@
         //Ase
         LuoAse(-100, Level.Top + 70);
-        LuoAse(Level.Left + 20, Level.Bottom + 100);
+        LuoAse(-505, Level.Bottom + 100);
         if(multiplayer == 1) LuoAse(+100, Level.Top + 70);
         
@@ -344 +365 @@
 
         //p2_hp
-        DoubleMeter p2_hp = new DoubleMeter(100);
+        p2_hp = new DoubleMeter(5);
         Label player2 = new Label("Player 2");
         player2.X = Screen.Left + 40;
         player2.Y = Screen.Top - 40;
-        p2_hp.MaxValue = 100;
+        p2_hp.MaxValue = 5;
         ProgressBar p2_hpPalkki = new ProgressBar(170, 20);
         p2_hpPalkki.BindTo(p2_hp);
@@ -367 +388 @@
         p2_ammo_label.BindTo(p2_ammo);
         p2_ammo_lipas.Y = Screen.Top - 50;
-        p2_ammo_lipas.X = +100;
+        p2_ammo_lipas.X = +60;
         vali.Y = Screen.Top - 50;
-        vali.X = +85;
+        vali.X = +75;
         p2_ammo_label.Y = Screen.Top - 50;
-        p2_ammo_label.X = +60;
+        p2_ammo_label.X = +100;
         Add(p2_ammo_lipas);
         Add(vali);
@@ -437 +458 @@
         {
             PhysicsObject ammus = ak2.Shoot();
-            if (ammus != null) p1_lipas.Value--;
+            if (ammus != null) p2_lipas.Value--;
         }
         if (p1_lipas == 0)
@@ -445 +466 @@
             Add(lataa);
         }
-        if (multiplayer == 1 && p2_lipas == 0)
-        {
-            lataa2 = new Label("Reload");
+        if (multiplayer == 0) return;
+        if (p2_lipas == 0)
+        {
+            lataa2 = new Label("Reload (X)");
             lataa2.X = -50;
-            lataa.MaximumLifetime = TimeSpan.FromSeconds(1);
-            Add(lataa);
+            lataa2.MaximumLifetime = TimeSpan.FromSeconds(1);
+            Add(lataa2);
         }
     }
@@ -457 +479 @@
         if (kohde.Tag == "living") p1_hp.Value--;
         if (p1_hp == 0) GameOver();
+        if (multiplayer == 1 && p2_hp == 0) GameOver();
     }
     void LuoAikaLaskuri()
@@ -526 +549 @@
             ak1.Ammo.Value = p1_lipas.Value;
         }
+
+        if (multiplayer == 1 && p2_ammo > 29 && p2_lipas == 0)
+        {
+            p2_ammo.Value -= 30;
+            p2_lipas.Value += 30;
+            ak2.Ammo.Value = p2_lipas.Value;
+        }
+
         //if (p1_lipas == 0)
         //{
@@ -562 +593 @@
         ClearAll();
         Mouse.IsCursorVisible = true;
-        HighScoreWindow topIkkuna = new HighScoreWindow("Parhaat pisteet","Onneksi olkoon, pääsit listalle lahtaamalla %p zombia! Syötä nimesi:",
-                             topLista, killLaskuri);
+        HighScoreWindow topIkkuna = new HighScoreWindow("Parhaat pisteet", "Onneksi olkoon, pääsit listalle lahtaamalla %p zombia! Syötä nimesi:", topLista, killLaskuri);
         topIkkuna.Closed += TallennaPisteet;
         Add(topIkkuna);
@@ -569 +599 @@
     void TallennaPisteet(Window sender)
     {
-        DataStorage.Save<ScoreList>(topLista, "pisteet.xml");
+        DataStorage.Save<ScoreList>(topLista, "scores.xml");
         Valikko();
     }

2012/26/MikaL/Zombie Survival/Zombie Survival/Zombie SurvivalContent/Zombie SurvivalContent.contentproj

@@ -47 +47 @@
     <Compile Include="fullbar.png">
       <Name>fullbar</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-    </Compile>
-    <Compile Include="upbar.png">
-      <Name>upbar</Name>
       <Importer>TextureImporter</Importer>
       <Processor>TextureProcessor</Processor>