Changeset 1488

Timestamp:

2010-08-01 17:50:21 (11 years ago)

Author:

hniemi

Message:

Tasolaskuri lisätty

Location:

2010/23/hniemi/JyTris/JyTris

Files:

• Content/obj/x86/Debug/ContentPipeline.xml (modified) (1 diff)
• JyTris.suo (modified) (previous)
• Peli.cs (modified) (5 diffs)
• bin/x86/Debug/JyTris.exe (modified) (previous)
• bin/x86/Debug/JyTris.pdb (modified) (previous)
• obj/x86/Debug/JyTris.exe (modified) (previous)
• obj/x86/Debug/JyTris.pdb (modified) (previous)

2010/23/hniemi/JyTris/JyTris/Content/obj/x86/Debug/ContentPipeline.xml

@@ -7 +7 @@
       <BuildConfiguration>Debug</BuildConfiguration>
       <CompressContent>false</CompressContent>
-      <RootDirectory>D:\Opiskelu\kurssit\NPO2010\Jytris\Content\</RootDirectory>
-      <LoggerRootDirectory>D:\Opiskelu\kurssit\NPO2010\Jytris\</LoggerRootDirectory>
-      <IntermediateDirectory>D:\Opiskelu\kurssit\NPO2010\Jytris\Content\obj\x86\Debug\</IntermediateDirectory>
-      <OutputDirectory>D:\Opiskelu\kurssit\NPO2010\Jytris\bin\x86\Debug\Content\</OutputDirectory>
+      <RootDirectory>D:\Projektit\JyTris\JyTris\Content\</RootDirectory>
+      <LoggerRootDirectory>D:\Projektit\JyTris\JyTris\</LoggerRootDirectory>
+      <IntermediateDirectory>D:\Projektit\JyTris\JyTris\Content\obj\x86\Debug\</IntermediateDirectory>
+      <OutputDirectory>D:\Projektit\JyTris\JyTris\bin\x86\Debug\Content\</OutputDirectory>
     </Settings>
     <Assemblies>
       <Assembly>
-        <Key>C:\WINDOWS\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\3.1.0.0__6d5c3888ef60e27d\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
-        <Value>2010-04-17T01:01:45.234375+03:00</Value>
+        <Key>C:\Windows\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\3.1.0.0__6d5c3888ef60e27d\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
+        <Value>2010-07-28T21:36:27.8906026+03:00</Value>
       </Assembly>
     </Assemblies>

2010/23/hniemi/JyTris/JyTris/Peli.cs

@@ -34 +34 @@
         double vaikeusaste = 0.9 ;
         IntMeter pisteet = new IntMeter(0);
-        int taso = 1;
-
+        IntMeter taso = new IntMeter(0);
+        int tuhotutRivit = 0;
+
+        Label tasonaytto;
         Label pistenaytto;
 
@@ -115 +117 @@
         {
             pisteet.Value = 0;
+            taso.Value = 1;
+            tuhotutRivit = 0;
             introajastin.Stop();
             TuhoaKaikki();
@@ -153 +157 @@
 
             pisteet.Value += (potti/10) * taso * potti;
+
+            if (tuhotutRivit > 10)
+            {
+                tuhotutRivit -= 10;
+                taso.Value++;
+            }
         }
 
@@ -177 +187 @@
         {
             if (rivinIndeksi > pelikentta.Length || rivinIndeksi < 0) return;
+            tuhotutRivit++;
 
             for (int i = rivinIndeksi; i > 0; i--)
@@ -199 +210 @@
             pistenaytto = new Label(80, 20);
             pistenaytto.BindTo(pisteet);
-            pistenaytto.Position = new Vector(Screen.RightSafe - 100, Screen.TopSafe - 100);
+            pistenaytto.Position = new Vector(Screen.RightSafe - 200, Screen.TopSafe - 100);
+            //pistenaytto.Text = "Pisteet: ";
             Add(pistenaytto);
+
+            tasonaytto = new Label(20, 20);
+            tasonaytto.BindTo(taso);
+            tasonaytto.Position = new Vector(Screen.RightSafe - 200, Screen.TopSafe - 125);
+            //tasonaytto.Text = "Taso: ";
+            //tasonaytto.
+            Add(tasonaytto);
+            
 
             /*