Changeset 8864 for 2017

Timestamp:

2017-07-04 11:56:03 (2 years ago)

Author:

npo17_40

Message:

 

Location:

2017/27/EeliN/Selviytyja

Files:

• .vs/Selviytyja/v14/.suo (modified) (previous)
• Selviytyja/Selviytyja/Selviytyja.cs (modified) (7 diffs)
• Selviytyja/Selviytyja/Selviytyja.csproj.Debug.cachefile (modified) (1 diff)
• Selviytyja/Selviytyja/bin/x86/Debug/Content/PlayerIdleRight_0.xnb (modified) (previous)
• Selviytyja/Selviytyja/bin/x86/Debug/Content/PlayerWalkRight_0.xnb (modified) (previous)
• Selviytyja/Selviytyja/bin/x86/Debug/Content/PlayerWalkRight_1.xnb (modified) (previous)
• Selviytyja/Selviytyja/bin/x86/Debug/Selviytyja.exe (modified) (previous)
• Selviytyja/Selviytyja/bin/x86/Debug/Selviytyja.pdb (modified) (previous)
• Selviytyja/Selviytyja/obj/x86/Debug/ContentPipeline-{3B3FCF0A-DF81-4674-AF8D-360E80F14224}.xml (modified) (3 diffs)
• Selviytyja/Selviytyja/obj/x86/Debug/Selviytyja.csproj.FileListAbsolute.txt (modified) (1 diff)
• Selviytyja/Selviytyja/obj/x86/Debug/Selviytyja.exe (modified) (previous)
• Selviytyja/Selviytyja/obj/x86/Debug/Selviytyja.pdb (modified) (previous)
• Selviytyja/Selviytyja/obj/x86/Debug/cachefile-{3B3FCF0A-DF81-4674-AF8D-360E80F14224}-targetpath.txt (modified) (1 diff)
• Selviytyja/SelviytyjaContent/PlayerIdleRight_0.png (modified) (previous)
• Selviytyja/SelviytyjaContent/PlayerWalkRight_0.png (modified) (previous)
• Selviytyja/SelviytyjaContent/PlayerWalkRight_1.png (modified) (previous)
• Selviytyja/SelviytyjaContent/SelviytyjaContent.contentproj (modified) (1 diff)

2017/27/EeliN/Selviytyja/Selviytyja/Selviytyja/Selviytyja.cs

@@ -11 +11 @@
     int Speed = 100;
     public Image idleRight = LoadImage("PlayerIdleRight_0");
+    public Image puuimg = LoadImage("Tree_0");
+    public Image stoneimg = LoadImage("Stone_0");
     private Image[] playerWalkR = LoadImages("PlayerWalkRight_0","PlayerWalkRight_1");
     Image idleLeft;
     private Image[] playerWalkL;
+    Image Bg = LoadImage("grass");
+    List<PhysicsObject> objektilista = new List<PhysicsObject>();
     public override void Begin()
     {
@@ -19 +23 @@
         SmoothTextures = false;
         Player ukko = new Player(50, 50);
+        //ukko.MakeStatic();
         ukko.Image = idleRight;
+        ukko.CanRotate = false;
+        ukko.PlayerImageRight = idleRight;
+        ukko.PlayerImageLeft = Image.Mirror(idleRight.Clone());
+        ukko.PlayerImage = ukko.PlayerImageRight;
         //idleLeft = Image.Mirror(idleRight);
         //playerWalkL = playerWalkR;
@@ -25 +34 @@
         //playerWalkL[0] = Image.Mirror(playerWalkR[0]).Clone();
         ukko.PlayerWalkR = new Animation(playerWalkR);
-        //ukko.PlayerWalkL = Animation.Mirror(ukko.PlayerWalkR);
+        //ukko.PlayerWalkL = Animation.Mirror(ukko.PlayerWalkR.cl);
+        ukko.Restitution = 0;
         Level.Background.Color = Color.Black;
         Add(ukko);
+        Level.Background.Image = Bg;
+        Level.Background.TileToLevel();
+        Camera.ZoomToLevel();
+        LuoKiviRndm();
+        LuoPuuRndm();
+
 
 
@@ -41 +57 @@
 
 
+
         PhoneBackButton.Listen(ConfirmExit, "Lopeta peli");
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
+
+     
     }
     void MoveSideways(Player pelaaja, Vector direction)
     {
         pelaaja.Velocity = new Vector(direction.X, pelaaja.Velocity.Y);
-        PlayerAnimation(pelaaja, direction.X);
+        PlayerAnimation(pelaaja, direction);
     }
 
@@ -53 +72 @@
     {
         pelaaja.Velocity = new Vector(pelaaja.Velocity.X, direction.Y);
-        //PlayerAnimation(pelaaja, direction.X);
-    }
-
-    public void PlayerAnimation(Player player, double direction)
-    {
-        player.PlayerAnimation(direction);
+
+        PlayerAnimation(pelaaja, direction);
+    }
+
+    public void PlayerAnimation(Player player, Vector direction)
+    {
+        MessageDisplay.Clear();
+        MessageDisplay.Add("PlayerRight = " + player.PlayerRight + ", direction = " + direction);
+        if (direction.X != 0)
+        {
+            player.PlayerAnimation(direction.X);
+            return;
+        }
+        if (direction.Y != 0)
+        {
+            if (player.PlayerRight) player.Animation = player.PlayerWalkR;
+            else player.Animation = Animation.Mirror(player.PlayerWalkR);
+
+        }
+        else player.PlayerAnimation(0);
+
         //if (direction == 0) player.Animation.Stop();
         //else
         //    player.Animation.Start();
-        
+
+    }
+
+    void LuoKivi(double x,double y)
+    {
+        PhysicsObject stone = PhysicsObject.CreateStaticObject(40, 40);
+        stone.Image = stoneimg;
+        stone.Shape = Shape.Circle;
+        stone.X = x;
+        stone.Restitution = 0;
+        stone.Y = y;
+        Add(stone);
+        objektilista.Add(stone);
+        for (int i = 0; i < objektilista.Count-1; i++)
+        {
+            if ((stone.Position - objektilista[i].Position).Magnitude < 90 )
+            {
+                objektilista.Remove(stone);
+                stone.Destroy();
+            }
+        }
+    }
+
+    void LuoKiviRndm()
+    {
+        for (int i = 0; i < 20; i++)
+        {
+            
+            double x = RandomGen.NextDouble(Level.Left,Level.Right);
+            double y = RandomGen.NextDouble(Level.Bottom, Level.Top);
+            LuoKivi(x, y);
+        }
+    }
+    void LuoPuu(double x, double y)
+    {
+        PhysicsObject puu = PhysicsObject.CreateStaticObject(100, 100);
+        puu.Image = puuimg;
+        puu.X = x;
+        puu.Y = y;
+        Add(puu);
+        objektilista.Add(puu);
+        for (int i = 0; i < objektilista.Count - 1; i++)
+        {
+            if ((puu.Position - objektilista[i].Position).Magnitude < 90)
+            {
+                objektilista.Remove(puu);
+                puu.Destroy();
+            }
+        }
+    }
+
+    void LuoPuuRndm()
+    {
+        for (int i = 0; i < 20; i++)
+        {
+
+            double x = RandomGen.NextDouble(Level.Left, Level.Right);
+            double y = RandomGen.NextDouble(Level.Bottom, Level.Top);
+            LuoPuu(x, y);
+        }
     }
 }
@@ -71 +164 @@
     public Animation PlayerWalkL;
     public Image PlayerImage;
+    public Image PlayerImageRight;
+    public Image PlayerImageLeft;
 
     public Player(double leveys, double korkeus)
@@ -76 +171 @@
     {
         //idleRight = Selviytyja.Move();
-    }
+ }
     public void PlayerAnimation(double direction)
     {
+
+        if (direction == 0 && PlayerImage == PlayerImageLeft)
+        {
+            this.Animation = null;
+            if (PlayerRight)
+            {
+                PlayerRight = true;
+                PlayerImage = (PlayerImageRight);
+            }
+            this.Image = (PlayerImage);
+            
+            return;
+        }
+        else if (direction == 0 && PlayerImage == PlayerImageRight)
+        {
+            this.Animation = null;
+            if (PlayerRight == false)
+            {
+                PlayerRight = false;
+                PlayerImage = (PlayerImageLeft);
+            }
+                this.Image = (PlayerImage);
+                      
+            return;
+        }
+
         if (direction < 0)
         {
-            this.Animation = Animation.Mirror(PlayerWalkR);
-            this.Animation.Start();
+            PlayerRight = false;
+            if (this.Animation.IsPlaying == false)
+            {
+                this.Animation = Animation.Mirror(PlayerWalkR);
+                this.Animation.Start();
+            }
         }
         else if (direction > 0)
         {
-            this.Animation = PlayerWalkR;
-            this.Animation.Start();
-        }
-
-
-        if (PlayerRight == true)
-        {
-            PlayerImage = Image.Mirror(this.Image);
-            this.Image = Image.Mirror(this.Image);
-            PlayerRight = false;
-        }
-        else if (PlayerRight == false)
-        {
-            PlayerImage = Image.Mirror(this.Image);
-            this.Image = Image.Mirror(this.Image);
             PlayerRight = true;
-        }
-
-
-
-        if (direction == 0)
-        {
-            //this.Animation = this.Image;
-            this.Animation = null;
-            this.Image = PlayerImage;
-            //return;
+            if (this.Animation.IsPlaying == false)
+            {
+                this.Animation = PlayerWalkR;
+                this.Animation.Start();
+            }
         }
         if (this.Animation != null) this.Animation.FPS = 3;
-    }
+
+
+
+
+
+        
+    }
+
 }

2017/27/EeliN/Selviytyja/Selviytyja/Selviytyja/Selviytyja.csproj.Debug.cachefile

@@ -2 +2 @@
 Content\PlayerWalkRight_0.xnb
 Content\PlayerWalkRight_1.xnb
+Content\grass.xnb
+Content\Tree_0.xnb
+Content\Stone_0.xnb

2017/27/EeliN/Selviytyja/Selviytyja/Selviytyja/obj/x86/Debug/ContentPipeline-{3B3FCF0A-DF81-4674-AF8D-360E80F14224}.xml

@@ -9 +9 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\PlayerIdleRight_0.xnb</Output>
-      <Time>2017-07-03T13:04:51.8943462+03:00</Time>
+      <Time>2017-07-04T11:52:16.3512078+03:00</Time>
     </Item>
     <Item>
@@ -18 +18 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\PlayerWalkRight_0.xnb</Output>
-      <Time>2017-07-03T13:59:50.743235+03:00</Time>
+      <Time>2017-07-04T11:53:34.9508947+03:00</Time>
     </Item>
     <Item>
@@ -27 +27 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\PlayerWalkRight_1.xnb</Output>
-      <Time>2017-07-03T13:59:58.305269+03:00</Time>
+      <Time>2017-07-04T11:54:05.9596768+03:00</Time>
+    </Item>
+    <Item>
+      <Source>grass.png</Source>
+      <Name>grass</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\grass.xnb</Output>
+      <Time>2017-07-04T10:32:44.2025662+03:00</Time>
+    </Item>
+    <Item>
+      <Source>Tree_0.png</Source>
+      <Name>Tree_0</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\Tree_0.xnb</Output>
+      <Time>2017-07-04T11:55:15.7842714+03:00</Time>
+    </Item>
+    <Item>
+      <Source>Stone_0.png</Source>
+      <Name>Stone_0</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\Stone_0.xnb</Output>
+      <Time>2017-07-04T11:54:41.2164752+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>

2017/27/EeliN/Selviytyja/Selviytyja/Selviytyja/obj/x86/Debug/Selviytyja.csproj.FileListAbsolute.txt

@@ -10 +10 @@
 C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\PlayerWalkRight_0.xnb
 C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\PlayerWalkRight_1.xnb
+C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\grass.xnb
+C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\Tree_0.xnb
+C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\Stone_0.xnb

2017/27/EeliN/Selviytyja/Selviytyja/Selviytyja/obj/x86/Debug/cachefile-{3B3FCF0A-DF81-4674-AF8D-360E80F14224}-targetpath.txt

@@ -2 +2 @@
 Content\PlayerWalkRight_0.xnb
 Content\PlayerWalkRight_1.xnb
+Content\grass.xnb
+Content\Tree_0.xnb
+Content\Stone_0.xnb

2017/27/EeliN/Selviytyja/Selviytyja/SelviytyjaContent/SelviytyjaContent.contentproj

@@ -66 +66 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="grass.png">
+      <Name>grass</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Tree_0.png">
+      <Name>Tree_0</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Stone_0.png">
+      <Name>Stone_0</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.