Changeset 1644 for 2010

Timestamp:

2010-08-05 22:22:15 (13 years ago)

Author:

pakralki

Message:

 

Location:

2010/31/pakralki/tank destroier

Files:

• Content/obj/x86/Release/Content.contentproj.FileListAbsolute.txt (modified) (1 diff)
• Content/obj/x86/Release/ContentPipeline.xml (modified) (1 diff)
• Peli.cs (modified) (10 diffs)
• bin/x86/Release/tank destroier.exe (modified) (previous)
• bin/x86/Release/tank destroier.pdb (modified) (previous)
• obj/x86/Release/tank destroier.csproj.FileListAbsolute.txt (modified) (1 diff)
• obj/x86/Release/tank destroier.exe (modified) (previous)
• obj/x86/Release/tank destroier.pdb (modified) (previous)

2010/31/pakralki/tank destroier/Content/obj/x86/Release/Content.contentproj.FileListAbsolute.txt

@@ -1 +1 @@
 C:\Users\Kari\Projektit\Game\tank destroier\Content\obj\x86\Release\ResolveAssemblyReference.cache
+C:\Users\Patrik\Projektit\Game\tank destroier\Content\obj\x86\Release\ResolveAssemblyReference.cache

2010/31/pakralki/tank destroier/Content/obj/x86/Release/ContentPipeline.xml

@@ -7 +7 @@
       <BuildConfiguration>Release</BuildConfiguration>
       <CompressContent>true</CompressContent>
-      <RootDirectory>C:\Users\Kari\Projektit\Game\tank destroier\Content\</RootDirectory>
-      <LoggerRootDirectory>C:\Users\Kari\Projektit\Game\tank destroier\</LoggerRootDirectory>
-      <IntermediateDirectory>C:\Users\Kari\Projektit\Game\tank destroier\Content\obj\x86\Release\</IntermediateDirectory>
-      <OutputDirectory>C:\Users\Kari\Projektit\Game\tank destroier\bin\x86\Release\Content\</OutputDirectory>
+      <RootDirectory>C:\Users\Patrik\Projektit\Game\tank destroier\Content\</RootDirectory>
+      <LoggerRootDirectory>C:\Users\Patrik\Projektit\Game\tank destroier\</LoggerRootDirectory>
+      <IntermediateDirectory>C:\Users\Patrik\Projektit\Game\tank destroier\Content\obj\x86\Release\</IntermediateDirectory>
+      <OutputDirectory>C:\Users\Patrik\Projektit\Game\tank destroier\bin\x86\Release\Content\</OutputDirectory>
     </Settings>
     <Assemblies>

2010/31/pakralki/tank destroier/Peli.cs

@@ -16 +16 @@
     DoubleMeter voimaMittari2;
 
+    int laskuri = 10;
+    Boolean yksinpeli = false;
+
     protected override void Begin()
     {
@@ -30 +33 @@
         valikonKohdat.Add(kohta1);
 
-        Label kohta2 = new Label("Lopeta");
-        kohta2.Position = new Vector(0, -40);
+        Label kohta2 = new Label("Aloita yksinpeli");
+        kohta2.Position = new Vector(0, 0);
         valikonKohdat.Add(kohta2);
 
+        Label kohta3 = new Label("Lopeta");
+        kohta3.Position = new Vector(0, -40);
+        valikonKohdat.Add(kohta3);
+
         foreach (Label valikonKohta in valikonKohdat)
         {
@@ -40 +47 @@
 
         Mouse.ListenOn(kohta1, MouseButton.Left, ButtonState.Pressed, AloitaMoninpeli, null);
-        Mouse.ListenOn(kohta2, MouseButton.Left, ButtonState.Pressed, Lopeta, null);
+        Mouse.ListenOn(kohta2, MouseButton.Left, ButtonState.Pressed, Aloitayksinpeli, null);
+        Mouse.ListenOn(kohta3, MouseButton.Left, ButtonState.Pressed, Lopeta, null);
 
         Mouse.IsCursorVisible = true;
@@ -66 +74 @@
         ClearAll();
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, Valikko, "Palaa valikkoon");
+        yksinpeli = false;
+        Aloitapeli();
+    }
+
+    void Aloitayksinpeli()
+    {
+        ClearAll();
+        Keyboard.Listen(Key.Escape, ButtonState.Pressed, Valikko, "Palaa valikkoon");
+        yksinpeli = true;
         Aloitapeli();
     }
@@ -81 +98 @@
         Luotankki2();
         Camera.ZoomToLevel();
-        Level.CreateGround(200, 250, 20, 15);
+        Level.CreateGround(200, 250, 20, 10);
     }
 
@@ -91 +108 @@
         Add(tankki);
         tankki.Cannon.CannonBallCollision = KuulaOsuu;
+        tankki.Cannon.Ammo.Value = 1000;
         voimaMittari.Value = 100;
         tankki.Mass = 200;
@@ -103 +121 @@
         Add(tankki2);
         tankki2.Cannon.CannonBallCollision = KuulaOsuu;
+        tankki2.Cannon.Ammo.Value = 1000;
         voimaMittari2.Value = 100;
         tankki2.Mass = 200;
@@ -183 +202 @@
     {
         t.Accelerate(vaanto);
-
     }
 
@@ -204 +222 @@
             {
                 tankki.Destroy();
-                MessageDisplay.Add("pelaaja2 voitti");
+                if (yksinpeli)
+                {
+                    MessageDisplay.Add("AI voitti");
+                }
+                else
+                {
+                    MessageDisplay.Add("pelaaja2 voitti");
+                }
             }
         }
@@ -251 +276 @@
         AsetaOhjaimet();
 
-        Timer ajastin = new Timer();
-        ajastin.Interval = 0.5;
-        ajastin.Trigger += new Timer.TriggerHandler(PseudoAI);
-        //AddTimer(ajastin);
-        ajastin.Start();
+        if (yksinpeli)
+        {
+            Timer ajastin = new Timer();
+            ajastin.Interval = 0.01;
+            ajastin.Trigger += new Timer.TriggerHandler(PseudoAI);
+            //AddTimer(ajastin);
+            ajastin.Start();
+        }
     }
 
     void PseudoAI(Timer sender)
     {
-      MessageDisplay.Add("Timer");
-      tankki2.Cannon.Power.Value = 10000;
-      tankki2.Cannon.Shoot();
+        double ero = tankki.X - tankki2.X;
+
+        if (laskuri > 0)
+        {
+            laskuri -= 1;
+            if (ero > 500)
+            {
+                tankki2.Accelerate(-1.0);
+            }
+            else
+            {
+                tankki2.Accelerate(1.0);
+            }
+        }
+        else
+        {
+            laskuri = 45;
+            //MessageDisplay.Add("Ero " + ero + " kulma " + tankki2.Cannon.Angle.Degree);
+
+            if (ero > 400)
+            {
+                tankki2.Cannon.Angle = Angle.Degrees(25) - tankki2.Angle;
+            }
+            else if (ero > 200)
+            {
+                tankki2.Cannon.Angle = Angle.Degrees(10) - tankki2.Angle;
+            }
+            else
+            {
+                tankki2.Cannon.Angle = Angle.Degrees(5) - tankki2.Angle;
+            }
+            tankki2.Cannon.Power.Value = 10000;
+            tankki2.Cannon.Shoot();
+        }
     }
 }

2010/31/pakralki/tank destroier/obj/x86/Release/tank destroier.csproj.FileListAbsolute.txt

@@ -7 +7 @@
 C:\Users\Kari\Projektit\Game\tank destroier\obj\x86\Release\tank destroier.exe
 C:\Users\Kari\Projektit\Game\tank destroier\obj\x86\Release\tank destroier.pdb
+C:\Users\Patrik\Projektit\Game\tank destroier\bin\x86\Release\tank destroier.exe
+C:\Users\Patrik\Projektit\Game\tank destroier\bin\x86\Release\tank destroier.pdb
+C:\Users\Patrik\Projektit\Game\tank destroier\bin\x86\Release\Jypeli2.dll
+C:\Users\Patrik\Projektit\Game\tank destroier\bin\x86\Release\Jypeli2.xml
+C:\Users\Patrik\Projektit\Game\tank destroier\obj\x86\Release\ResolveAssemblyReference.cache
+C:\Users\Patrik\Projektit\Game\tank destroier\obj\x86\Release\Microsoft.Xna.Framework.RuntimeProfile.txt
+C:\Users\Patrik\Projektit\Game\tank destroier\obj\x86\Release\tank destroier.exe
+C:\Users\Patrik\Projektit\Game\tank destroier\obj\x86\Release\tank destroier.pdb