Changeset 6390 for 2015

Timestamp:

2015-06-25 19:08:42 (5 years ago)

Author:

sieerinn

Message:

Kolmannessa kentässä on laavaa ja toimiva kamera.

Location:

2015/26/ohjaajat/HillbillyRun

Files:

• HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun.cs (modified) (11 diffs)
• HillbillyRun/HillbillyRun/HillbillyRunContent/HillbillyRunContent.contentproj (modified) (1 diff)
• HillbillyRun/HillbillyRun/HillbillyRunContent/ground_top_volcano.png (added)
• HillbillyRun/HillbillyRun/HillbillyRunContent/ground_volcano.png (added)
• HillbillyRun/HillbillyRun/HillbillyRunContent/lavawall.png (added)
• HillbillyRun/HillbillyRun/HillbillyRunContent/level1.png (modified) (previous)
• HillbillyRun/HillbillyRun/HillbillyRunContent/level2.png (modified) (previous)
• HillbillyRun/HillbillyRun/HillbillyRunContent/prisoner.png (added)
• HillbillyRun/HillbillyRun/HillbillyRunContent/spikeleft.png (added)
• HillbillyRun/HillbillyRun/HillbillyRunContent/volcanobackground.png (added)
• Materiaaleja/loppukuva.png (added)

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun.cs

@@ -176 +176 @@
 
     # region Images
-    private Image[] groundImages = LoadImages("ground", "ground_forest", "ground");    //Näitä ei tosin kaikkia kenties jaksa tehdä erilaisiksi levelistä riippuen
-    private Image[] groundTopImages = LoadImages("ground_top", "ground_top_forest", "ground_top");
+    private Image[] groundImages = LoadImages("ground", "ground_forest", "ground_volcano");
+    private Image[] groundTopImages = LoadImages("ground_top", "ground_top_forest", "ground_top_volcano");
     private Image[] foregroundDecorations = LoadImages("viljaa", "grass", "grass");
     private Image[] blockImages = LoadImages("box2", "rock");
@@ -196 +196 @@
     private Image treeBranchImage = LoadImage("bigtreebranch");
     private Image forestBackgroundImage = LoadImage("forestbackground");
+    private Image volcanoBackgroundImage = LoadImage("volcanobackground");
     private Image swingTrapImage = LoadImage("tukki");
 
@@ -201 +202 @@
     private Image leverLeftImage = LoadImage("lever_left");
     private Image leverRightImage = LoadImage("lever_right");
+
+    private Image lavaWallImage = LoadImage("lavawall");
+    private Image spikeImage = LoadImage("spikes");
+    private Image spikeLeftImage = LoadImage("spikeleft");
 
     private Animation crawl;
@@ -403 +408 @@
         cameraTimer.Start();
 
-        //Background
-        GameObject forestBackground = new GameObject(Level.Width, Level.Height);
-        forestBackground.Image = forestBackgroundImage;
-        forestBackground.TextureWrapSize = new Vector(5, 1);
-        Add(forestBackground, -3);
-        Layers[-3].RelativeTransition = new Vector(0.5, 1.0);
-
-        if (levelNumber == 1)
+        // Background trees.
+        if (levelNumber < 2)
+        {
+            GameObject forestBackground = new GameObject(Level.Width, Level.Height);
+            forestBackground.Image = forestBackgroundImage;
+            forestBackground.TextureWrapSize = new Vector(5, 1);
+            Add(forestBackground, -3);
+            Layers[-3].RelativeTransition = new Vector(0.5, 1.0);
+        }
+
+        // Background color.
+        if (levelNumber == 0)
+        {
+            Level.Background.CreateGradient(Color.Black, Color.SkyBlue);
+        }
+        else if (levelNumber == 1)
         {
             Level.Background.CreateGradient(Color.Black, Color.FromHexCode("495147"));
         }
-        else
-        {
-            Level.Background.CreateGradient(Color.Black, Color.SkyBlue);
+        else if (levelNumber == 2)
+        {
+            Level.Background.Image = volcanoBackgroundImage;
+            Level.Background.FitToLevel();
         }
     }
@@ -455 +469 @@
         level.SetTileMethod(Color.FromHexCode("4C7F00"), CreateLevel);
 
+        level.SetTileMethod(Color.FromHexCode("FF00DC"), CreateSpike, spikeImage);
+        level.SetTileMethod(Color.FromHexCode("C600AC"), CreateSpike, spikeLeftImage);
+
         level.Optimize(Color.Brown);    //Color.Black   //Tekee jännittäviä asioita wheatille, jos optimoidaan (tietysti). Jotenn. 
-
         level.Execute(TILE_SIZE, TILE_SIZE);
+
+        // Kolmanteen kenttään laavaseinä.
+        if (levelNumber == 2)
+        {
+            PhysicsObject lava = PhysicsObject.CreateStaticObject(300, Level.Height);
+            lava.Image = lavaWallImage;
+            lava.X = Camera.ScreenToWorld(new Vector(-Window.Width / 2.0, 0)).X;
+            //lava.Y = Camera.ScreenToWorld(new Vector(0, 0)).Y;
+            Add(lava);
+
+            var updateTimer = new Timer {Interval = 0.01};
+            updateTimer.Timeout += delegate
+            {
+                lava.Left = Camera.X - Window.Width / 2.0;
+                //lava.Y = Camera.ScreenToWorld(new Vector(0, 0)).Y;
+            };
+            updateTimer.Start();
+        }
+    }
+
+    void CreateSpike(Vector position, double width, double height, Image img)
+    {
+        PhysicsObject spike = PhysicsObject.CreateStaticObject(width, height);
+        spike.Image = img;
+        spike.Position = position;
+        //spike.Tag = "burn";
+        Add(spike);
     }
 
@@ -715 +758 @@
     {
         PlatformCharacter shroom = new PlatformCharacter(width, height * 2);
-        shroom.Position = position + new Vector(0, shroom.Height/ 2);
+        shroom.Position = position + new Vector(0, shroom.Height / 2);
         shroom.Tag = "burn";
         shroom.Tag += "shroom";
@@ -747 +790 @@
             Timer.SingleShot(RandomGen.NextDouble(3, 5), delegate { shroom.Brain = attackBrain; });
 
-                Timer.SingleShot(1.5,
-                    delegate
+            Timer.SingleShot(1.5,
+                delegate
+                {
+                    for (int i = 0; i < matoja; i++)
                     {
-                        for (int i = 0; i < matoja; i++)
-                       {
-                            CreateWorm(shroom.Position + RandomGen.NextVector(- 200, 0, 200, 0), TILE_SIZE, TILE_SIZE);
-                            shroom.Brain = brain;
-                        }
-                    });
-
-           
+                        CreateWorm(shroom.Position + RandomGen.NextVector(-200, 0, 200, 0), TILE_SIZE, TILE_SIZE);
+                        shroom.Brain = brain;
+                    }
+                });
+
+
         };
 
@@ -772 +815 @@
             matoja += RandomGen.NextInt(1, 5);
             rahkeet--;
-            if(rahkeet<1)
+            if (rahkeet < 1)
             {
                 shroom.Destroy();
@@ -778 +821 @@
             }
         });
-        
-    
+
+
     }
 
@@ -998 +1041 @@
         bool wheat = probability < 20;
 
-        if (wheat)
+        if (wheat && levelNumber < 2)
         {
             GameObject wheatBlock = new GameObject(width * 1.5, height * 2);
@@ -1132 +1175 @@
         Vector maxPosition = new Vector(minX, maxY);
 
-        cameraTarget = (minPosition + maxPosition) * 0.5;
-        cameraTarget.X = Math.Max(cameraTargetX, minX);     //Lellllll.
-
-        //cameraTarget.Y = Math.Max(cameraTarget.X, Level.Bottom + Window.Height/2.0);
-
-        cameraTargetX = Math.Max(cameraTargetX, minX);
-
-        cameraTarget.X = Math.Min(cameraTargetX, rightCamLimit);
-        cameraTarget.Y = Math.Max(cameraTarget.Y, bottomCamLimit);
-
+        if (levelNumber < 2)
+        {
+            cameraTarget = (minPosition + maxPosition)*0.5;
+            cameraTarget.X = Math.Max(cameraTargetX, minX); //Lellllll.
+
+            //cameraTarget.Y = Math.Max(cameraTarget.X, Level.Bottom + Window.Height/2.0);
+
+            cameraTargetX = Math.Max(cameraTargetX, minX);
+
+            cameraTarget.X = Math.Min(cameraTargetX, rightCamLimit);
+            cameraTarget.Y = Math.Max(cameraTarget.Y, bottomCamLimit);
+        }
+        else if (levelNumber == 2)
+        {
+            cameraTarget.Y = ((minPosition + maxPosition) * 0.5).Y;
+            cameraTarget.Y = Math.Max(cameraTarget.Y, bottomCamLimit);
+
+            // Pakotetaan kameraa eteenpäin. Jos kaikki pelaajat on näytön oikealla puolella, niin liikutetaan nopeammin.
+            double cameraSpeed = players.All(p => Camera.WorldToScreen(p.Position).X > 0) ? 4.0 : 1.0;
+            cameraTarget.X += cameraSpeed;            
+        }
+
+        // Pelaajien sijainnin rajaus ikkunaan.
         double windowMax = Camera.ScreenToWorld(new Vector(Window.Width / 2.0, 0)).X;
         double windowMin = Camera.ScreenToWorld(new Vector(-Window.Width / 2.0, 0)).X;

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRunContent/HillbillyRunContent.contentproj

@@ -349 +349 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="prisoner.png">
+      <Name>prisoner</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="spikeleft.png">
+      <Name>spikeleft</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ground_top_volcano.png">
+      <Name>ground_top_volcano</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="ground_volcano.png">
+      <Name>ground_volcano</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="volcanobackground.png">
+      <Name>volcanobackground</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="lavawall.png">
+      <Name>lavawall</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.