Changeset 2989 for 2012/24

Timestamp:

2012-06-13 14:39:57 (11 years ago)

Author:

jahebahu

Message:

Talletus.

Location:

2012/24/HenriH

Files:

• Misc/musiikkizedd.mp3 (added)
• Misc/taso.png (added)
• SpaceBattle/SpaceBattle.suo (modified) (previous)
• SpaceBattle/SpaceBattle/SpaceBattle/SpaceBattle.cs (modified) (7 diffs)
• SpaceBattle/SpaceBattle/SpaceBattle/SpaceBattle.csproj.Debug.cachefile (modified) (1 diff)
• SpaceBattle/SpaceBattle/SpaceBattle/bin/x86/Debug/Content/musiikkizedd.wma (added)
• SpaceBattle/SpaceBattle/SpaceBattle/bin/x86/Debug/Content/musiikkizedd.xnb (added)
• SpaceBattle/SpaceBattle/SpaceBattle/bin/x86/Debug/SpaceBattle.exe (modified) (previous)
• SpaceBattle/SpaceBattle/SpaceBattle/bin/x86/Debug/SpaceBattle.pdb (modified) (previous)
• SpaceBattle/SpaceBattle/SpaceBattle/obj/x86/Debug/SpaceBattle.csproj.FileListAbsolute.txt (modified) (1 diff)
• SpaceBattle/SpaceBattle/SpaceBattle/obj/x86/Debug/SpaceBattle.exe (modified) (previous)
• SpaceBattle/SpaceBattle/SpaceBattle/obj/x86/Debug/SpaceBattle.pdb (modified) (previous)
• SpaceBattle/SpaceBattle/SpaceBattle/obj/x86/Debug/cachefile-{E7CDF0F0-0662-472D-8CF9-9D60000A2596}-targetpath.txt (modified) (1 diff)
• SpaceBattle/SpaceBattle/SpaceBattleContent/SpaceBattleContent.contentproj (modified) (1 diff)
• SpaceBattle/SpaceBattle/SpaceBattleContent/musiikkizedd.mp3 (added)
• SpaceBattle/SpaceBattle/SpaceBattleContent/obj/x86/Debug/ContentPipeline.xml (modified) (1 diff)

2012/24/HenriH/SpaceBattle/SpaceBattle/SpaceBattle/SpaceBattle.cs

@@ -17 +17 @@
     Image alus2kaasuttaa = LoadImage("alus2kaasuttaa");
     Image plasma1 = LoadImage("plasmaammus1");
-    Image plasma2 = LoadImage("plasmaammus2");
+    Image plasma2 = LoadImage("plasmammus2");
     List<Label> valikonKohdat;
     AssaultRifle Plasma1;
@@ -81 +81 @@
         Camera.StayInLevel = true;
         Level.CreateBorders(0.5, false);
-        
-        // Tähän tulee biisi MediaPlayer.Play("nimi");
+
+        MediaPlayer.Play("musiikkizedd");
         laskuri3();
         laskuri4();
@@ -201 +201 @@
     void AmmusOsui(PhysicsObject Ammus, PhysicsObject kohde)
     {
-        if (kohde.Tag.ToString() == "alus2")
+        if (kohde.Tag.ToString() == "Alus2")
         {
             rajahdys.AddEffect(Ammus.Position, 20);
+            elamalaskuri1.Value -= 10;
         }
         if (elamalaskuri1.Value <= 0)
@@ -213 +214 @@
             if (kuolemalaskuri1.Value <= 0)
             {
-                //Lopputeksti1();
+                lopputeksti1();
             }
         }
@@ -227 +228 @@
         {
             ammus.Size *= 2;
-            ammus.Image = plasma1;
+            ammus.Image = plasma2;
             Plasma2.Ammo.Value = 3000;
 
@@ -252 +253 @@
             if (kuolemalaskuri2.Value <= 0)
             {
-               //Lopputeksti2();
+               lopputeksti2();
             }
         }
@@ -323 +324 @@
 
     }
-}
+
+    void lopputeksti1()
+    {
+        ClearAll();
+
+        Camera.ZoomToLevel();
+        Camera.StayInLevel = true;
+        Level.Background.Image = tausta;
+        Level.Background.FitToLevel();
+        Label tekstikentta1 = new Label("NASA voitti!");
+        tekstikentta1.Color = Color.Transparent;
+        tekstikentta1.TextColor = Color.White;
+        tekstikentta1.BorderColor = Color.Transparent;
+        tekstikentta1.Font = Font.DefaultLargeBold;
+
+        Label kohta1 = new Label("Takaisin Valikkoon");
+        kohta1.Position = new Vector(0, -80);
+        Add(kohta1);
+
+        
+
+        Mouse.ListenOn(kohta1, MouseButton.Left, ButtonState.Pressed, Valikko
+            , null);
+        
+
+
+        if (Mouse.IsCursorOn(kohta1))
+        {
+            kohta1.TextColor = Color.Red;
+        }
+        else
+        {
+            kohta1.TextColor = Color.White;
+            kohta1.Font = Font.DefaultLargeBold;            
+                Add(tekstikentta1);
+
+            }
+        }
+
+    void lopputeksti2()
+    {
+        ClearAll();
+
+        Camera.ZoomToLevel();
+        Camera.StayInLevel = true;
+        Level.Background.Image = tausta;
+        Level.Background.FitToLevel();
+        Label tekstikentta1 = new Label("Soviet Russia voitti!");
+        tekstikentta1.Color = Color.Transparent;
+        tekstikentta1.TextColor = Color.White;
+        tekstikentta1.BorderColor = Color.Transparent;
+        tekstikentta1.Font = Font.DefaultLargeBold;
+
+        Label kohta1 = new Label("Takaisin Valikkoon");
+        kohta1.Position = new Vector(0, -80);
+        Add(kohta1);
+
+
+
+        Mouse.ListenOn(kohta1, MouseButton.Left, ButtonState.Pressed, Valikko
+            , null);
+
+
+
+        if (Mouse.IsCursorOn(kohta1))
+        {
+            kohta1.TextColor = Color.Red;
+        }
+        else
+        {
+            kohta1.TextColor = Color.White;
+            kohta1.Font = Font.DefaultLargeBold;
+            Add(tekstikentta1);
+
+        }
+    }
+
+    }
     
 
+
+    
+

2012/24/HenriH/SpaceBattle/SpaceBattle/SpaceBattle/SpaceBattle.csproj.Debug.cachefile

@@ -7 +7 @@
 Content\plasmammus2.xnb
 Content\rajahdys.xnb
+Content\musiikkizedd.xnb
+Content\musiikkizedd.wma

2012/24/HenriH/SpaceBattle/SpaceBattle/SpaceBattle/obj/x86/Debug/SpaceBattle.csproj.FileListAbsolute.txt

@@ -15 +15 @@
 C:\MyTemp\HenriH\SpaceBattle\SpaceBattle\SpaceBattle\bin\x86\Debug\Content\plasmammus2.xnb
 C:\MyTemp\HenriH\SpaceBattle\SpaceBattle\SpaceBattle\bin\x86\Debug\Content\rajahdys.xnb
+C:\MyTemp\HenriH\SpaceBattle\SpaceBattle\SpaceBattle\bin\x86\Debug\Content\musiikkizedd.xnb
+C:\MyTemp\HenriH\SpaceBattle\SpaceBattle\SpaceBattle\bin\x86\Debug\Content\musiikkizedd.wma

2012/24/HenriH/SpaceBattle/SpaceBattle/SpaceBattle/obj/x86/Debug/cachefile-{E7CDF0F0-0662-472D-8CF9-9D60000A2596}-targetpath.txt

@@ -7 +7 @@
 Content\plasmammus2.xnb
 Content\rajahdys.xnb
+Content\musiikkizedd.xnb
+Content\musiikkizedd.wma

2012/24/HenriH/SpaceBattle/SpaceBattle/SpaceBattleContent/SpaceBattleContent.contentproj

@@ -90 +90 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="musiikkizedd.mp3">
+      <Name>musiikkizedd</Name>
+      <Importer>Mp3Importer</Importer>
+      <Processor>SongProcessor</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. 

2012/24/HenriH/SpaceBattle/SpaceBattle/SpaceBattleContent/obj/x86/Debug/ContentPipeline.xml

@@ -74 +74 @@
       <Time>2012-06-13T09:57:19.207699+03:00</Time>
     </Item>
+    <Item>
+      <Source>musiikkizedd.mp3</Source>
+      <Name>musiikkizedd</Name>
+      <Importer>Mp3Importer</Importer>
+      <Processor>SongProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\HenriH\SpaceBattle\SpaceBattle\SpaceBattle\bin\x86\Debug\Content\musiikkizedd.xnb</Output>
+      <Extra>C:\MyTemp\HenriH\SpaceBattle\SpaceBattle\SpaceBattle\bin\x86\Debug\Content\musiikkizedd.wma</Extra>
+      <Time>2012-06-13T13:39:45.5972345+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>