Changeset 6954 for 2015/30

Timestamp:

2015-07-23 10:44:28 (8 years ago)

Author:

elhytone

Message:

Peli juttuja

Location:

2015/30/EliasHy

Files:

• 1329766522.png.png (deleted)
• SpaceAdventure/SpaceAdventure.suo (deleted)
• SpaceAdventure/SpaceAdventure/SpaceAdventure/SpaceAdventure.cs (modified) (7 diffs)
• SpaceAdventure/SpaceAdventure/SpaceAdventure/bin/x86/Debug/SpaceAdventure.exe (modified) (previous)
• SpaceAdventure/SpaceAdventure/SpaceAdventure/bin/x86/Debug/SpaceAdventure.pdb (modified) (previous)
• SpaceAdventure/SpaceAdventure/SpaceAdventure/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• SpaceAdventure/SpaceAdventure/SpaceAdventure/obj/x86/Debug/SpaceAdventure.csproj.FileListAbsolute.txt (modified) (2 diffs)
• SpaceAdventure/SpaceAdventure/SpaceAdventure/obj/x86/Debug/SpaceAdventure.exe (modified) (previous)
• SpaceAdventure/SpaceAdventure/SpaceAdventure/obj/x86/Debug/SpaceAdventure.pdb (modified) (previous)
• SpaceAdventure/SpaceAdventure/SpaceAdventureContent/obj/x86/Debug/ContentPipeline.xml (modified) (12 diffs)
• SpaceAdventure/SpaceAdventure/SpaceAdventureContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)

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

@@ -8 +8 @@
 
 public class SpaceAdventure : PhysicsGame
-{
+{   
     PhysicsObject pelaaja;
     AssaultRifle ase;
@@ -20 +20 @@
     Image Vihollinenalus = LoadImage("enemy ship 2");
 
+
     IntMeter pistelaskuri;
+    DoubleMeter elamaLaskuri;
 
     double eteenpain = 500;
@@ -26 +28 @@
 
     public override void Begin()
-    {
+
+    {
+        Valikko();
+       
+    }
+
+    void Valikko()
+    {
+        MultiSelectWindow alkuValikko = new MultiSelectWindow("Pelin alkuvalikko",
+        "Aloita peli", "Parhaat pisteet", "Lopeta");
+        Add(alkuValikko);
+        alkuValikko.AddItemHandler(0, AloitaPeli);
+        //alkuValikko.AddItemHandler(1, ParhaatPisteet);
+        alkuValikko.AddItemHandler(2, Exit);
+        Level.Background.CreateStars();
+    }
+
+    void AloitaPeli()
+
+    {
+        ClearAll();
         LuoKentta();
 
@@ -41 +63 @@
         LuoPistelaskuri();
     }
+
 
     void LiikutaPelaajaa(double voima, int miten)
@@ -102 +125 @@
         pelaaja.AngularDamping = 0.9;
         pelaaja.Tag = "pelaaja";
+        AddCollisionHandler(pelaaja, "Asteroidi",delegate(PhysicsObject A, PhysicsObject B) 
+        {
+            PelaajaVahingoittuu(A, B, 3);
+        } );
+
+        AddCollisionHandler(pelaaja, "pahis", delegate(PhysicsObject A, PhysicsObject B)
+        {
+            PelaajaVahingoittuu(A, B, 1);
+        });
+
+        AddCollisionHandler(pelaaja, "pahis2", delegate(PhysicsObject A, PhysicsObject B)
+        {
+            PelaajaVahingoittuu(A, B, 3);
+        });
+        
+        elamaLaskuri = new DoubleMeter(10);
+        elamaLaskuri.MaxValue = 10;
+        elamaLaskuri.LowerLimit += ElamaLoppui;
+
+        ProgressBar elamaPalkki = new ProgressBar(150, 20);
+        elamaPalkki.X = Screen.Left + 150;
+        elamaPalkki.Y = Screen.Top - 20;
+        elamaPalkki.BindTo(elamaLaskuri);
+        Add(elamaPalkki);
 
         ase = new AssaultRifle(1, 1);
@@ -130 +177 @@
         Asteroidi.Position = paikka;
         Add(Asteroidi);
+        Asteroidi.Mass = 100;
+        Asteroidi.Tag = "Asteroidi";
+
 
     }
@@ -194 +244 @@
         }
     }
+    void ElamaLoppui()
+    {
+        MessageDisplay.Add("Pelaaja tuhoutui");
+        pelaaja.Destroy();
+        Timer.SingleShot(1, Valikko);
+        
+
+
+    }
+    void PelaajaVahingoittuu(PhysicsObject Pelaaja,PhysicsObject Pahis, int Vahinko)
+    {
+        elamaLaskuri.Value -= Vahinko;
+
+    }
+
 }

2015/30/EliasHy/SpaceAdventure/SpaceAdventure/SpaceAdventure/obj/x86/Debug/SpaceAdventure.csproj.FileListAbsolute.txt

@@ +1 @@
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta.xnb
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool alus.xnb
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool asteroid bu.xnb
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolhyvisalus.xnb
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolasteroidya.xnb
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool space.xnb
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Boss Ship_zpspn6osve5.xnb
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\enemy ship 2.xnb
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cloud.xnb
+C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\laser.xnb
 C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\SpaceAdventure.exe
 C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\SpaceAdventure.pdb
@@ -7 +17 @@
 C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\obj\x86\Debug\SpaceAdventure.exe
 C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\obj\x86\Debug\SpaceAdventure.pdb
-C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta.xnb
-C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool alus.xnb
-C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool asteroid bu.xnb
-C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolhyvisalus.xnb
-C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolasteroidya.xnb
-C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool space.xnb
-C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Boss Ship_zpspn6osve5.xnb
-C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\enemy ship 2.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool alus.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool asteroid bu.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolhyvisalus.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolasteroidya.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool space.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Boss Ship_zpspn6osve5.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\enemy ship 2.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\SpaceAdventure.exe
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\SpaceAdventure.pdb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Jypeli.dll
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Jypeli.xml
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\obj\x86\Debug\SpaceAdventure.csprojResolveAssemblyReference.cache
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\obj\x86\Debug\SpaceAdventure.exe
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\obj\x86\Debug\SpaceAdventure.pdb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cloud.xnb
-C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\laser.xnb

2015/30/EliasHy/SpaceAdventure/SpaceAdventure/SpaceAdventureContent/obj/x86/Debug/ContentPipeline.xml

@@ -8 +8 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta.xnb</Output>
-      <Time>2015-07-23T09:45:06.3199068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta.xnb</Output>
+      <Time>2015-07-22T12:37:40.9096187+03:00</Time>
     </Item>
     <Item>
@@ -17 +17 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool alus.xnb</Output>
-      <Time>2015-07-23T09:45:06.3229068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool alus.xnb</Output>
+      <Time>2015-07-21T14:12:05.8146469+03:00</Time>
     </Item>
     <Item>
@@ -26 +26 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool asteroid bu.xnb</Output>
-      <Time>2015-07-23T09:45:06.3069068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool asteroid bu.xnb</Output>
+      <Time>2015-07-21T14:55:03.3357265+03:00</Time>
     </Item>
     <Item>
@@ -35 +35 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolhyvisalus.xnb</Output>
-      <Time>2015-07-23T09:45:06.3329068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolhyvisalus.xnb</Output>
+      <Time>2015-07-22T11:35:17.1851187+03:00</Time>
     </Item>
     <Item>
@@ -44 +44 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolasteroidya.xnb</Output>
-      <Time>2015-07-23T09:45:06.3259068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolasteroidya.xnb</Output>
+      <Time>2015-07-21T14:55:35.1129265+03:00</Time>
     </Item>
     <Item>
@@ -53 +53 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool space.xnb</Output>
-      <Time>2015-07-23T09:45:06.4709068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool space.xnb</Output>
+      <Time>2015-07-22T11:05:32.8286354+03:00</Time>
     </Item>
     <Item>
@@ -62 +62 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Boss Ship_zpspn6osve5.xnb</Output>
-      <Time>2015-07-23T09:45:06.3039068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Boss Ship_zpspn6osve5.xnb</Output>
+      <Time>2015-07-22T12:56:39.8323187+03:00</Time>
     </Item>
     <Item>
@@ -71 +71 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\enemy ship 2.xnb</Output>
-      <Time>2015-07-23T09:45:06.3299068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\enemy ship 2.xnb</Output>
+      <Time>2015-07-22T13:01:57.3205187+03:00</Time>
     </Item>
     <Item>
@@ -80 +80 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cloud.xnb</Output>
-      <Time>2015-07-23T09:46:46.4079068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cloud.xnb</Output>
+      <Time>2015-07-23T09:57:07.8638619+03:00</Time>
     </Item>
     <Item>
@@ -89 +89 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\laser.xnb</Output>
-      <Time>2015-07-23T09:46:46.4089068+03:00</Time>
+      <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\laser.xnb</Output>
+      <Time>2015-07-23T09:57:07.8638619+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>
@@ -98 +98 @@
       <BuildConfiguration>Debug</BuildConfiguration>
       <CompressContent>false</CompressContent>
-      <RootDirectory>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventureContent\</RootDirectory>
-      <LoggerRootDirectory>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\</LoggerRootDirectory>
-      <IntermediateDirectory>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventureContent\obj\x86\Debug\</IntermediateDirectory>
-      <OutputDirectory>C:\MyTemp\hyva\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\</OutputDirectory>
+      <RootDirectory>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventureContent\</RootDirectory>
+      <LoggerRootDirectory>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\</LoggerRootDirectory>
+      <IntermediateDirectory>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventureContent\obj\x86\Debug\</IntermediateDirectory>
+      <OutputDirectory>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\</OutputDirectory>
     </Settings>
     <Assemblies>
@@ -138 +138 @@
       <Assembly>
         <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
-        <Value>2015-07-09T14:19:15.2277481+03:00</Value>
+        <Value>2015-07-09T14:51:24.2760228+03:00</Value>
       </Assembly>
     </Assemblies>