Changeset 8469 for 2017/23/NinaH/Kebab Run

Timestamp:

2017-06-09 11:32:04 (4 years ago)

Author:

nupeohje

Message:

 

Location:

2017/23/NinaH/Kebab Run

Files:

• Kebab Run.v12.suo (modified) (previous)
• Kebab Run/Kebab RunContent/beach.jpg (modified) (previous)
• Kebab Run/Kebab RunContent/kentta1.txt (modified) (1 diff)
• Kebab Run/Kebab RunContent/obj/x86/Debug/ContentPipeline.xml (modified) (9 diffs)
• Kebab Run/Kebab RunContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• Kebab Run/Kebab RunContent/obj/x86/Debug/Kebab RunContent.contentproj.FileListAbsolute.txt (modified) (1 diff)
• Kebab Run/Kebab_Run/Kebab_Run.cs (modified) (10 diffs)
• Kebab Run/Kebab_Run/Kebab_Run.csproj.Debug.cachefile (modified) (2 diffs)
• Kebab Run/Kebab_Run/bin/x86/Debug/Content/beach.xnb (modified) (previous)
• Kebab Run/Kebab_Run/bin/x86/Debug/Content/kentta1.xnb (modified) (previous)
• Kebab Run/Kebab_Run/bin/x86/Debug/Kebab_Run.exe (modified) (previous)
• Kebab Run/Kebab_Run/bin/x86/Debug/Kebab_Run.pdb (modified) (previous)
• Kebab Run/Kebab_Run/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• Kebab Run/Kebab_Run/obj/x86/Debug/Kebab_Run.csproj.FileListAbsolute.txt (modified) (1 diff)
• Kebab Run/Kebab_Run/obj/x86/Debug/Kebab_Run.exe (modified) (previous)
• Kebab Run/Kebab_Run/obj/x86/Debug/Kebab_Run.pdb (modified) (previous)
• Kebab Run/Kebab_Run/obj/x86/Debug/cachefile-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}-targetpath.txt (modified) (2 diffs)

2017/23/NinaH/Kebab Run/Kebab Run/Kebab RunContent/kentta1.txt

@@ -5 +5 @@
 ................................................................................................................................................................................................................................................................................................................................................................................................................
 ............................................B...................................................................................................................................................................................................................................................................................................................................................................
+...............................................................................................................................................................................................................................................................................................................................................................................................................
 ................................................................................................................................................................................................................................................................................................................................................................................................................
-................................................................................................................................................................................................................................................................................................................................................................................................................
-................................................................................................................................................................................................................................................................................................................................................................................................................
-................................................................................................................................................................................................................................................................................................................................................................................................................
-...L...........................................................................................................................................................................................................................................................................................................................................................................................................
-................................................................................................................................................................................................................................................................................................................................................................................................................
+...............................................................................................................................................................................................T................................................................................................................................................................................................................
+........K.......................................................................L.......A.......................................................................................................................................................................................................................................................................................................................
 ################################################################################################################################################################################################################################################################################################################################################################################################################

2017/23/NinaH/Kebab Run/Kebab Run/Kebab RunContent/obj/x86/Debug/ContentPipeline.xml

@@ -8 +8 @@
       <Processor>TextFileContentProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta1.xnb</Output>
-      <Time>2017-06-08T12:42:32.007757+03:00</Time>
+      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta1.xnb</Output>
+      <Time>2017-06-09T10:52:36.5802138+03:00</Time>
+    </Item>
+    <Item>
+      <Source>kentta2.txt</Source>
+      <Name>kentta2</Name>
+      <Importer>TextFileImporter</Importer>
+      <Processor>TextFileContentProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta2.xnb</Output>
+      <Time>2017-06-08T12:40:51.8587431+03:00</Time>
     </Item>
     <Item>
@@ -17 +26 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabelainvalkoinentausta.xnb</Output>
+      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabelainvalkoinentausta.xnb</Output>
       <Time>2017-06-07T12:51:58.5813613+03:00</Time>
     </Item>
@@ -26 +35 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\ak47.xnb</Output>
+      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\ak47.xnb</Output>
       <Time>2017-06-07T12:47:36.4238273+03:00</Time>
     </Item>
@@ -35 +44 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabkuolema.xnb</Output>
+      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabkuolema.xnb</Output>
       <Time>2017-06-07T13:08:09.4705162+03:00</Time>
     </Item>
@@ -44 +53 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\paistinpannnu.xnb</Output>
+      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\paistinpannnu.xnb</Output>
       <Time>2017-06-07T13:11:43.1606524+03:00</Time>
     </Item>
@@ -53 +62 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\teu.xnb</Output>
+      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\teu.xnb</Output>
       <Time>2017-06-07T13:20:55.5467025+03:00</Time>
     </Item>
@@ -62 +71 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\beach.xnb</Output>
-      <Time>2017-06-08T10:52:27.4749198+03:00</Time>
+      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\beach.xnb</Output>
+      <Time>2017-06-09T10:11:23.4612189+03:00</Time>
     </Item>
     <Item>
@@ -71 +80 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\karvakasi.xnb</Output>
+      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\karvakasi.xnb</Output>
       <Time>2017-06-08T12:35:37.6639193+03:00</Time>
-    </Item>
-    <Item>
-      <Source>kentta2.txt</Source>
-      <Name>kentta2</Name>
-      <Importer>TextFileImporter</Importer>
-      <Processor>TextFileContentProcessor</Processor>
-      <Options>None</Options>
-      <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta2.xnb</Output>
-      <Time>2017-06-08T12:40:51.8587431+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>
@@ -89 +89 @@
       <BuildConfiguration>Debug</BuildConfiguration>
       <CompressContent>false</CompressContent>
-      <RootDirectory>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab RunContent\</RootDirectory>
-      <LoggerRootDirectory>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\</LoggerRootDirectory>
-      <IntermediateDirectory>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab RunContent\obj\x86\Debug\</IntermediateDirectory>
-      <OutputDirectory>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\</OutputDirectory>
+      <RootDirectory>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab RunContent\</RootDirectory>
+      <LoggerRootDirectory>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\</LoggerRootDirectory>
+      <IntermediateDirectory>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab RunContent\obj\x86\Debug\</IntermediateDirectory>
+      <OutputDirectory>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\</OutputDirectory>
     </Settings>
     <Assemblies>

2017/23/NinaH/Kebab Run/Kebab Run/Kebab RunContent/obj/x86/Debug/Kebab RunContent.contentproj.FileListAbsolute.txt

@@ -1 +1 @@
 C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab RunContent\obj\x86\Debug\Kebab RunContent.contentprojResolveAssemblyReference.cache
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab RunContent\obj\x86\Debug\Kebab RunContent.contentprojResolveAssemblyReference.cache

2017/23/NinaH/Kebab Run/Kebab Run/Kebab_Run/Kebab_Run.cs

@@ -22 +22 @@
     Image kebabelaimenKuva = LoadImage("kebabelainvalkoinentausta");
     Image ak47Kuva = LoadImage("ak47");
+    Image karvakasiKuva = LoadImage("karvakasi");
     Image paistinpannuKuva = LoadImage("paistinpannu");
     Image teurastajaKuva = LoadImage("teu");
+    Image forestKuva = LoadImage("forest");
     Image beachKuva = LoadImage("beach");
+    Image hillsKuva = LoadImage("hills");
+    Image kichenKuva = LoadImage("kitchen"); 
+    Image hellKuva = LoadImage("hell");
 
     int kenttaNro = 1;
@@ -30 +35 @@
     public override void Begin()
     {
-
         SeuraavaKentta();
-
-        
+        LisaaTaustakuvat();
     }
 
@@ -54 +57 @@
         PhysicsObject karvakasi = PhysicsObject.CreateStaticObject(leveys, korkeus);
         karvakasi.Position = paikka;
-        karvakasi.Image = ak47Kuva;
+        karvakasi.CollisionIgnoreGroup = 6;
+        karvakasi.Image = karvakasiKuva;
         karvakasi.Tag = "lassi";
-        karvakasi.Size = new Vector(70.0, 70.0);
+        
+
+        karvakasi.Size = new Vector(60.0, 120.0);
         Add(karvakasi);
     }
@@ -72 +78 @@
     void LisaaTeurastaja(Vector paikka, double leveys, double korkeus)
     {
-        PhysicsObject Teurastaja = PhysicsObject.CreateStaticObject(leveys, korkeus);
-        Teurastaja.Position = paikka;
-        Teurastaja.Image = teurastajaKuva;
-        Teurastaja.Tag = "lassi";
-        Teurastaja.Size = new Vector(60.0, 100.0);
-        Add(Teurastaja);
+        PhysicsObject teurastaja = new PhysicsObject(leveys, korkeus);
+        teurastaja.Position = paikka;
+        teurastaja.CollisionIgnoreGroup = 6;
+        teurastaja.Image = teurastajaKuva;
+        teurastaja.Tag = "lassi";
+        teurastaja.Size = new Vector(60.0, 100.0);
+        teurastaja.CanRotate = false;
+
+        Timer liikutinajastin = new Timer();
+        liikutinajastin.Interval = 0.1;
+        liikutinajastin.Timeout += delegate
+        {
+            teurastaja.Push(new Vector(-2000.0, 0.0));
+        };
+        liikutinajastin.Start();
+
+        Add(teurastaja);
     }
 
@@ -104 +121 @@
         kebabelain = new PlatformCharacter(leveys, korkeus);
         kebabelain.Position = paikka;
-        kebabelain.Mass = 4.0;
+       // kebabelain.Mass = 4.0;
         kebabelain.Size = new Vector(70.0, 70.0);
         kebabelain.Image = kebabelaimenKuva;
         AddCollisionHandler<PlatformCharacter, PhysicsObject>(kebabelain, "ase", TormaaAk);
         Add(kebabelain);
+    }
+
+    void LisaaNappaimet()
+    {
+        Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
+        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
+
+        Keyboard.Listen(Key.W, ButtonState.Pressed, Hyppaa, "kebu hyppää", kebabelain, hyppyNopeus);
+        Keyboard.Listen(Key.Space, ButtonState.Down, Ammuaseella, "kebu ampuu");
+        Keyboard.Listen(Key.E, ButtonState.Pressed, ThrowAwayGun, "heitä ase");
+    }
+
+    GameObject[] Taustat;
+
+    void LisaaTaustakuvat()
+    {
+        PhysicsObject Object = PhysicsObject.CreateStaticObject(Level.Width, 10);
+        Object.X = 0.0;
+        Object.Y = kebabelain.Y - kebabelain.Height/2.0;
+        Object.IsVisible = false;
+        Object.Color = Color.HotPink;
+        //Add(Object, -2);
+        Add(Object);
+        Taustat = new GameObject[3];
+        
+        for (int i = -1, l = 0; i < 2; i++, l++)
+        {
+            Taustat[l] = new GameObject(beachKuva.Width, Level.Height);
+            Taustat[l].Image = beachKuva;
+            
+            Taustat[l].Position = new Vector(i * beachKuva.Width, 0);
+            Add(Taustat[l], -3);
+        }
+    }
+
+    protected override void Update(Time time)
+    {
+        base.Update(time);
+
+        float deltaTime = (float)time.SinceLastUpdate.Milliseconds / 100.0f;
+
+        foreach (GameObject tausta in Taustat)
+            tausta.Position -= new Vector(10 * deltaTime, 0);
+
+        if (Taustat[0].Right <= Level.Left)
+        {
+            GameObject temp = Taustat[0];
+            Taustat[0] = Taustat[1];
+            Taustat[1] = Taustat[2];
+            Taustat[2] = temp;
+
+            Taustat[2].Position = new Vector(Taustat[1].Right + Taustat[2].Width / 2.0, 0);
+        }
     }
 
@@ -127 +197 @@
         Camera.StayInLevel = true;
     }
-    void LisaaNappaimet()
-    {
-        Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
-        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
-
-        Keyboard.Listen(Key.D, ButtonState.Down, Liikuta, "liikkuu vasemmalle", kebabelain, nopeus);
-        Keyboard.Listen(Key.A, ButtonState.Down, Liikuta, "liikkuu vasemmalle", kebabelain, -nopeus);
-        Keyboard.Listen(Key.W, ButtonState.Pressed, Hyppaa, "kebu hyppää", kebabelain, hyppyNopeus);
-        Keyboard.Listen(Key.Space, ButtonState.Down, Ammuaseella, "kebu ampuu");
-    }
 
     void Liikuta(PlatformCharacter kebabelain, double nopeus)
@@ -146 +206 @@
     {
         kebabelain.Jump(nopeus);
-    }§
+    }
 
     void TormaaAk(PlatformCharacter kebabelain, PhysicsObject ase)
@@ -154 +214 @@
         ase.Destroy();
         kebabelain.Weapon = new AssaultRifle(70.0, 40.0);
+        kebabelain.Weapon.MaxAmmoLifetime = TimeSpan.FromSeconds(0.7);
+        kebabelain.Weapon.Ammo.Value = 3;
+
     }
 
     void LiikutaTaustaa()
 {
-   foreach ( GameObject taustakuva in taustakuvat )
+   /*foreach (GameObject taustakuva in taustakuvat)
    {
       taustakuva.Y += scrollausnopeus;
@@ -172 +235 @@
          ekaTaustakuva = taustakuva;
       }
+   }*/
+   }
+
+    void LuoTaustakuvat()
+    {
+        //taustaAjastin = new Timer();
+        //taustaAjastin.Interval = 0.01;
+        //taustaAjastin.Timeout += LiikutaTaustaa;
+        //taustaAjastin.Start();
+
+        //taustakuvat = new List<GameObject>();
+        //LisaaTaustakuva("forest", 300, 300);
+        //LisaaTaustakuva("feald", 300, 300);
+        //LisaaTaustakuva("hills", 300, 300);
+        //LisaaTaustakuva("kitchen", 300, 300);
+        //KisaaTaustakuva("hell", 300, 300);
+    }
+ 
 
     void Ammuaseella()
@@ -178 +259 @@
     }
 
+    void ThrowAwayGun()
+    {
+        kebabelain.Weapon = null;
+    }
 
 

2017/23/NinaH/Kebab Run/Kebab Run/Kebab_Run/Kebab_Run.csproj.Debug.cachefile

@@ -1 +1 @@
 Content\kentta1.xnb
+Content\kentta2.xnb
 Content\kebabelainvalkoinentausta.xnb
 Content\ak47.xnb
@@ -7 +8 @@
 Content\beach.xnb
 Content\karvakasi.xnb
-Content\kentta2.xnb

2017/23/NinaH/Kebab Run/Kebab Run/Kebab_Run/obj/x86/Debug/Kebab_Run.csproj.FileListAbsolute.txt

@@ -16 +16 @@
 C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\karvakasi.xnb
 C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta2.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta1.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta2.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabelainvalkoinentausta.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\ak47.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabkuolema.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\paistinpannnu.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\teu.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\beach.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\karvakasi.xnb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Kebab_Run.exe
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Kebab_Run.pdb
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Jypeli.dll
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Jypeli.xml
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\obj\x86\Debug\Kebab_Run.csprojResolveAssemblyReference.cache
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\obj\x86\Debug\Kebab_Run.exe
+C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\obj\x86\Debug\Kebab_Run.pdb

2017/23/NinaH/Kebab Run/Kebab Run/Kebab_Run/obj/x86/Debug/cachefile-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}-targetpath.txt

@@ -1 +1 @@
 Content\kentta1.xnb
+Content\kentta2.xnb
 Content\kebabelainvalkoinentausta.xnb
 Content\ak47.xnb
@@ -7 +8 @@
 Content\beach.xnb
 Content\karvakasi.xnb
-Content\kentta2.xnb