Changeset 4710 for 2013/30

Timestamp:

2013-07-26 11:36:12 (9 years ago)

Author:

alraniko

Message:

 

Location:

2013/30/AleksiK

Files:

• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/Hazy Maze Game.csproj.Debug.cachefile (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/Hazy_Maze_Game.cs (modified) (6 diffs)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Blue Block.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Boulder Hole.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Boulder.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Coin Block.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Coin.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Goal.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Mushroom.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Standard.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Switch.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Content/Vihu.xnb (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Hazy Maze Game.exe (modified) (previous)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Debug/Hazy Maze Game.pdb (modified) (previous)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/bin/x86/Release (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/obj/x86/Debug/ContentPipeline-{DB817938-4D8D-4144-ADCC-C150753D773C}.xml (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/obj/x86/Debug/Hazy Maze Game.exe (modified) (previous)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/obj/x86/Debug/Hazy Maze Game.pdb (modified) (previous)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/obj/x86/Debug/cachefile-{DB817938-4D8D-4144-ADCC-C150753D773C}-targetpath.txt (added)
• Hazy Maze Game/Hazy Maze Game/Hazy Maze GameContent/bin/x86/Release (added)
• Pong/Pong/Pong/obj/x86/Debug/ContentPipeline-{9F77D250-7FCB-477B-9BA5-E219A137BE2E}.xml (added)

2013/30/AleksiK/Hazy Maze Game/Hazy Maze Game/Hazy Maze Game/Hazy_Maze_Game.cs

@@ -74 +74 @@
                 "XAX X CXXXXXX XXXXCXX",
                 "XBX  XX2 2  X    2 CX",
-                "XPX1  X   X XCX X XXX",
-                "XMXC      XCXXC     X",
+                "X X1  X   X XCX X XXX",
+                "XMXC      XCXXC    PX",
                 "XXXXXXXXXXXXXXXXXXXXX",
                 };
@@ -101 +101 @@
                 "X  CX1  X1    X    CX",
                 "X XXXXVX2XX XXXXXXXXX",
-                "XB  XXSX X1    XC2  X",
-                "XPX1  XC   X X XX X X",
+                "XP  XXSX X1    XC2  X",
+                "XBX1  XC   X X XX X X",
                 "XMXC     XCXXX      X",
                 "XXXXXXXXXXXXXXXXXXXXX",
@@ -197 +197 @@
     {
         ClearGameObjects();
-        if (levelLaskuri.Value == 0)
+        if (levelLaskuri.Value == 1)
         {
             LuoMaailma(kenttaYksi);
         }
 
-        else if (levelLaskuri.Value == 1)
+        else if (levelLaskuri.Value == 2)
         {
             LuoMaailma(kenttaKaksi);
         }
 
-        else if (levelLaskuri.Value == 2)
+        else if (levelLaskuri.Value == 3)
         {
             LuoMaailma(kenttaKolme);
@@ -214 +214 @@
 
         LuoElamaLaskuri();
+        LuoLevelNaytto();
     }
 
@@ -224 +225 @@
     public void LuoLevelLaskuri()
     {
-        levelLaskuri = new IntMeter(0);
-        levelLaskuri.MaxValue = 10;
-    }
-
-    void LuoElamaLaskuri()
+        levelLaskuri = new IntMeter(1);
+        levelLaskuri.MaxValue = 10;   
+    }
+
+    public void LuoLevelNaytto()
+    {
+        Label levelNaytto = new Label();
+        levelNaytto.X = Level.Left - ruudunLeveys * 1.5;
+        levelNaytto.Y = Level.Top - ruudunKorkeus * 5;
+        levelNaytto.TextColor = Color.White;
+        levelNaytto.Color = Color.Black;
+        levelNaytto.Title = "Level";
+
+        levelNaytto.BindTo(levelLaskuri);
+        Add(levelNaytto);
+    }
+
+    public void LuoElamaLaskuri()
     {
         elamaLaskuri = new IntMeter(2);
@@ -360 +374 @@
         }
 
-        else if(levelLaskuri.Value == 2 && kolikkoLaskuri.Value == 1)
+        else if(levelLaskuri.Value == 3 && kolikkoLaskuri.Value == 1)
         {
             kolikkoBlock.Destroy();