Changeset 6288 for 2015

Timestamp:

2015-06-24 20:27:27 (7 years ago)

Author:

sieerinn

Message:

F12-näppäimellä siirtyy seuraavaan kenttään.

Location:

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun

Files:

• HillbillyRun/HillbillyRun.cs (modified) (7 diffs)
• HillbillyRunContent/HillbillyRunContent.contentproj (modified) (1 diff)
• HillbillyRunContent/grass.png (added)

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

@@ -122 +122 @@
 
     # region Images
-    private Image[] groundImages = LoadImages("ground");    //Näitä ei tosin kaikkia kenties jaksa tehdä erilaisiksi levelistä riippuen
-    private Image[] groundTopImages = LoadImages("ground_top");
-    private Image[] foregroundDecorations = LoadImages("viljaa");
-    private Image[] blockImages = LoadImages("box2");
+    private Image[] groundImages = LoadImages("ground", "ground");    //Näitä ei tosin kaikkia kenties jaksa tehdä erilaisiksi levelistä riippuen
+    private Image[] groundTopImages = LoadImages("ground_top", "ground_top");
+    private Image[] foregroundDecorations = LoadImages("viljaa", "grass");
+    private Image[] blockImages = LoadImages("box2", "box");
 
     private Image[] houseImages = LoadImages("house", "houseburned");
@@ -162 +162 @@
     public override void Begin()
     {
+        Initializing();
         //IntroSequence();
         //MainMenu();
@@ -287 +288 @@
     void StartGame()
     {
-        Initializing();
+        ClearAll();
         CreateLevel();
         ScreenSettings();
+        SetControls();
+    }
+
+    public void NextLevel()
+    {
+        levelNumber++;
+        StartGame();
     }
 
@@ -326 +334 @@
         cameraTimer.Start();
 
-
         //Background
         GameObject forestBackground = new GameObject(Level.Width, Level.Height);
@@ -339 +346 @@
     void CreateLevel()
     {
+        startingPlayers.Clear();
+        players.Clear();
         Gravity = new Vector(0, -1000);
 
@@ -360 +369 @@
         level.Optimize(Color.Black, Color.Brown);
         level.Execute(TILE_SIZE, TILE_SIZE);
-
-        SetControls();
     }
 
@@ -671 +678 @@
         Keyboard.Listen(Key.RightShift, ButtonState.Pressed, UseImprovement, "Player 2 uses their tools", startingPlayers[1]);
 
+        Keyboard.Listen(Key.F12, ButtonState.Pressed, NextLevel, null);
+
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Show help");
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Exit game");

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

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