Changeset 6921

Timestamp:

2015-07-22 13:33:40 (6 years ago)

Author:

elhytone

Message:

 

Location:

2015/30/EliasHy/SpaceAdventure

Files:

• SpaceAdventure.suo (modified) (previous)
• SpaceAdventure/SpaceAdventure/SpaceAdventure.cs (modified) (7 diffs)
• SpaceAdventure/SpaceAdventure/bin/x86/Debug/SpaceAdventure.exe (modified) (previous)
• SpaceAdventure/SpaceAdventure/bin/x86/Debug/SpaceAdventure.pdb (modified) (previous)
• SpaceAdventure/SpaceAdventure/obj/x86/Debug/SpaceAdventure.exe (modified) (previous)
• SpaceAdventure/SpaceAdventure/obj/x86/Debug/SpaceAdventure.pdb (modified) (previous)

2015/30/EliasHy/SpaceAdventure/SpaceAdventure/SpaceAdventure/SpaceAdventure.cs

@@ -15 +15 @@
     Image CoolAsteroidi = LoadImage("cool asteroid bu");
     Image taustaKuva = LoadImage("cool space");
+    Image Laser = LoadImage("laser");
+    Image Boss = LoadImage("Boss Ship_zpspn6osve5");
+    Image Vihollinenalus = LoadImage("enemy ship 2");
 
     double eteenpain = 500;
@@ -40 +43 @@
         {
             case 1:
-                pelaaja.Push(Vector.FromLengthAndAngle(voima, pelaaja.Angle));     
+                pelaaja.Push(Vector.FromLengthAndAngle(voima, pelaaja.Angle));
                 break;
             case 2:
@@ -53 +56 @@
                 break;
         }
-             
+
     }
 
@@ -68 +71 @@
 
         //Level.CreateBorders();
+        Level.CreateBorders();
 
         //3. Execute luo kentän
@@ -83 +87 @@
         pelaaja.AngularDamping = 0.9;
 
-        ase = new AssaultRifle(1,1);
-       
+        ase = new AssaultRifle(1, 1);
+
 
         Add(pelaaja);
@@ -120 +124 @@
     void LuoVihollinen2(Vector paikka, double leveys, double korkeus)
     {
-        PhysicsObject Vihollinen2 = new PhysicsObject(10, 10);
+        //PhysicsObject Vihollinen2 = new PhysicsObject(10, 10);
+        PhysicsObject Vihollinen2 = new PhysicsObject(Vihollinenalus);
         Vihollinen2.Color = Color.Gold;
         Vihollinen2.Position = paikka;
@@ -130 +135 @@
     void AmmusOsui(PhysicsObject ammus, PhysicsObject kohde)
     {
-  
+
 
     }
     void AmmuAseella(PhysicsObject pelaaja)
-    { 
+    {
         PhysicsObject ammus = ase.Shoot();
-        
+
         if (ammus != null)
         {
+            ammus.Size *= 0.5;
             ammus.MaximumLifetime = TimeSpan.FromSeconds(2.0);
+            ammus.Image = Laser;
         }
     }