Changeset 8723

Timestamp:

2017-06-15 13:55:21 (2 years ago)

Author:

npo17_8

Message:

 

Location:

2017/24/AaroM/Asteroids/Asteroids

Files:

• Asteroids/Asteroids.cs (modified) (7 diffs)
• Asteroids/Asteroids.csproj.Debug.cachefile (modified) (1 diff)
• Asteroids/bin/x86/Debug/Asteroids.exe (modified) (previous)
• Asteroids/bin/x86/Debug/Asteroids.pdb (modified) (previous)
• Asteroids/bin/x86/Debug/Content/laser.xnb (added)
• Asteroids/bin/x86/Debug/Content/spaceship 3.xnb (added)
• Asteroids/obj/x86/Debug/Asteroids.csproj.FileListAbsolute.txt (modified) (1 diff)
• Asteroids/obj/x86/Debug/Asteroids.exe (modified) (previous)
• Asteroids/obj/x86/Debug/Asteroids.pdb (modified) (previous)
• Asteroids/obj/x86/Debug/ContentPipeline-{093C8DB8-B433-4224-8809-5BA07E2A4E45}.xml (modified) (1 diff)
• Asteroids/obj/x86/Debug/cachefile-{093C8DB8-B433-4224-8809-5BA07E2A4E45}-targetpath.txt (modified) (1 diff)
• AsteroidsContent/AsteroidsContent.contentproj (modified) (1 diff)
• AsteroidsContent/laser.png (added)
• AsteroidsContent/spaceship 3.png (added)

2017/24/AaroM/Asteroids/Asteroids/Asteroids/Asteroids.cs

@@ -11 +11 @@
     Spaceship spaceship2;
     Spaceship spaceship1;
+    Spaceship spaceship3;
     IntMeter spaceship1Terveys;
     IntMeter spaceship2Terveys;
+    IntMeter spaceship3Terveys;
     AssaultRifle ufonAse;
 
@@ -24 +26 @@
         Pieniasteroidi(-165, -234);
         Pieniasteroidi(445, 234);
+        Pieniasteroidi(500, 400);
         Spaceship1(-150.0, 0.0);
         Spaceship2(150.0, 0.0);
+        Spaceship3(-150.0, -150);
         Liikkumiskomennot();
         Ufo(450, -450);
@@ -102 +106 @@
         ufo.Image = LoadImage("munufo");
         Add(ufo);
-        ufonAse = new AssaultRifle(30, 10);
+        ufonAse = new AssaultRifle(60, 20);
         ufonAse.Ammo.Value = 1000;
         ufonAse.ProjectileCollision = AmmusOsui;
         ufonAse.FireRate = 5.0;
-        ufonAse.Shoot();
+        ufonAse.IsVisible = false;
+        Timer ajastin = new Timer();
+        ajastin.Interval = 1.0;
+        ajastin.Timeout += Ammu;
+        ajastin.Start(); 
         ufo.Add(ufonAse);
+    }
+
+    void Ammu()
+    {
+        PhysicsObject panos = ufonAse.Shoot();
+
+        if (panos != null)
+        {
+            panos.Image = LoadImage("laser");
+            panos.Size = new Vector(20, 20);
+            panos.MaximumLifetime = new TimeSpan(0, 0, 10);
+        }
     }
 
@@ -135 +155 @@
         Add(spaceship2);
     }
+
+
+    void Spaceship3(double X, double Y)
+    {
+        spaceship3 = new Spaceship(50.0, 50.0);
+        spaceship3.X = X;
+        spaceship3.Y = X;
+        spaceship3.Image = LoadImage("spaceship 3");
+        spaceship3.Tag = "The Bandit";
+        AddCollisionHandler(spaceship3, Spaceship3Tormasi);
+        spaceship3Terveys = new IntMeter(3);
+        Add(spaceship3);
+
+    }
+
+
+
     void Liikkumiskomennot()
     {
@@ -146 +183 @@
         Keyboard.Listen(Key.W, ButtonState.Down, Liikutaspaceship1, null, new Vector(0, 100));
         Keyboard.Listen(Key.S, ButtonState.Down, Liikutaspaceship1, null, new Vector(0, -100));
+
+        Keyboard.Listen(Key.H, ButtonState.Down, Liikutaspaceship3, null, new Vector(-100, 0));
+        Keyboard.Listen(Key.K, ButtonState.Down, Liikutaspaceship3, null, new Vector(100, 0));
+        Keyboard.Listen(Key.U, ButtonState.Down, Liikutaspaceship3, null, new Vector(0, 100));
+        Keyboard.Listen(Key.J, ButtonState.Down, Liikutaspaceship3, null, new Vector(0, -100));
     }
     void Liikutaspaceship2(Vector vektori)
@@ -156 +198 @@
         spaceship1.Push(vektori);
      }
+
+    void Liikutaspaceship3(Vector vektori)
+    {
+        spaceship3.Push(vektori);
+    }
+
 
 
@@ -177 +225 @@
         
     }
-    void AmmusOsui(PhysicsObject ammus, PhysicsObject kohde)
-    {
-        Spaceship alus = (Spaceship)kohde;
-        alus.ElamaLaskuri.Value--;
-
-    }
+
+    void Spaceship3Tormasi(PhysicsObject tormaaja, PhysicsObject kohde)
+    {
+        if (kohde.Tag.Equals("pahis"))
+            spaceship3Terveys.Value--;
+
+        if (spaceship3Terveys.Value <= 0)
+            spaceship3.Destroy();
+    }
+
+
+
+
+        void AmmusOsui(PhysicsObject ammus, PhysicsObject kohde)
+    {
+        if (kohde.Tag == "Phantom Falcon" || kohde.Tag == "Arwing" || kohde.Tag == "The Bandit")
+        {
+            Spaceship alus = (Spaceship)kohde;
+            alus.ElamaLaskuri.Value--;
+        }
+
+        }
      
 

2017/24/AaroM/Asteroids/Asteroids/Asteroids/Asteroids.csproj.Debug.cachefile

@@ -9 +9 @@
 Content\space xd.xnb
 Content\spacemusic.xnb
+Content\laser.xnb
+Content\spaceship 3.xnb
 Content\spacemusic.wma

2017/24/AaroM/Asteroids/Asteroids/Asteroids/obj/x86/Debug/Asteroids.csproj.FileListAbsolute.txt

@@ -18 +18 @@
 C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\spacemusic.xnb
 C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\spacemusic.wma
+C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\laser.xnb
+C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\spaceship 3.xnb

2017/24/AaroM/Asteroids/Asteroids/Asteroids/obj/x86/Debug/ContentPipeline-{093C8DB8-B433-4224-8809-5BA07E2A4E45}.xml

@@ -93 +93 @@
       <Time>2017-06-15T11:05:46.7374736+03:00</Time>
     </Item>
+    <Item>
+      <Source>laser.png</Source>
+      <Name>laser</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\laser.xnb</Output>
+      <Time>2017-06-15T13:19:58.5962935+03:00</Time>
+    </Item>
+    <Item>
+      <Source>spaceship 3.png</Source>
+      <Name>spaceship 3</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\spaceship 3.xnb</Output>
+      <Time>2017-06-15T13:34:49.4365716+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>

2017/24/AaroM/Asteroids/Asteroids/Asteroids/obj/x86/Debug/cachefile-{093C8DB8-B433-4224-8809-5BA07E2A4E45}-targetpath.txt

@@ -10 +10 @@
 Content\spacemusic.xnb
 Content\spacemusic.wma
+Content\laser.xnb
+Content\spaceship 3.xnb

2017/24/AaroM/Asteroids/Asteroids/AsteroidsContent/AsteroidsContent.contentproj

@@ -115 +115 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="laser.png">
+      <Name>laser</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="spaceship 3.png">
+      <Name>spaceship 3</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.