Changeset 1203 for 2010/27

Timestamp:

2010-07-08 14:58:29 (13 years ago)

Author:

paaaanro

Message:

tausta, iskut

Location:

2010/27/heikriin

Files:

• CrabsAndShrimps (modified) (1 prop)
• CrabsAndShrimps/Content/Content.contentproj (modified) (2 diffs)
• CrabsAndShrimps/Content/paistinpannukuumana2.PNG (added)
• CrabsAndShrimps/CrabsAndShrimps.csproj (modified) (1 diff)
• CrabsAndShrimps/Peli.cs (modified) (6 diffs)
• paistinpannukuumana2.PNG (added)

2010/27/heikriin/CrabsAndShrimps/Content/Content.contentproj

@@ -1 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectGuid>695befa7-ead2-4032-9be5-de8f56484d50</ProjectGuid>
@@ -34 +34 @@
     <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.XImporter, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="paistinpannukuumana2.PNG">
+      <Name>paistinpannukuumana2</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
 </Project>

2010/27/heikriin/CrabsAndShrimps/CrabsAndShrimps.csproj

@@ -57 +57 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Jypeli2, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Jypeli2, Version=2.2.3.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Jypeli2.dll</HintPath>

2010/27/heikriin/CrabsAndShrimps/Peli.cs

@@ -10 +10 @@
     PlatformCharacter katkis;
     PlatformCharacter rapu;
+    GameObject pannu;
+    GameObject kukka;
+
+    IntMeter pisteLaskuri;
+    IntMeter katkisElamat, rapuElamat;
+
+ 
 
     protected override void Begin()
@@ -15 +22 @@
         AloitaPeli();
         luoKentta();
-        LisaaLaskurit();
-
+       
         katkis = new PlatformCharacter(220.0, 220.0);
         Add(katkis);
-        katkis.Mass = 4.0;
+        katkis.Mass = 3.0;
         katkis.X = 380.0;
         katkis.Y = -250.0;
+
+        //pannu = new GameObject(500, 500);
+        //pannu.Color = Color.Red;
+        //pannu.Tag = "pannu";
+        //Add(pannu);
+        //katkis.Add(pannu);
 
         rapu = new PlatformCharacter(300.0, 300.0);
@@ -28 +40 @@
         rapu.X = -380.0;
         rapu.Y = -200.0;
+
+        //kukka = new GameObject(500, 500);
+        //kukka.Color = Color.Red;
+        //rapu.Add(kukka);
+        
+        AddCollisionHandler(katkis, katkisTormaa);
+        AddCollisionHandler(rapu, rapuTormaa);
 
         Level.CreateBorders(false);
@@ -36 +55 @@
         Gravity = new Vector(0.0, -800.0);
         lisaaNappaimet();
+        LuoLaskuri();
     }
 
@@ -46 +66 @@
         Keyboard.Listen(Key.Right, ButtonState.Down, liikuta, "Liikkuu oikealle", katkis, 100.0);
         Keyboard.Listen(Key.Up, ButtonState.Pressed, hyppaa, "Hyppää", katkis, hyppyVoima);
-        Keyboard.Listen(Key.M, ButtonState.Pressed, katkisiskee, "Paistinpannu", katkis, 100.0);
+        Keyboard.Listen(Key.M, ButtonState.Pressed, katkisiskee, "Paistinpannu");
 
         Keyboard.Listen(Key.A, ButtonState.Down, liikuta, "Liikkuu vasemmalle", rapu, -100.0);
         Keyboard.Listen(Key.D, ButtonState.Down, liikuta, "Liikkuu oikealle", rapu, 100.0);
         Keyboard.Listen(Key.W, ButtonState.Pressed, hyppaa, "Hyppää", rapu, hyppyVoima);
+        Keyboard.Listen(Key.Q, ButtonState.Pressed, rapuiskee, "Kukka");
+    }
+
+    void katkisiskee()
+    {
+        if(katkis.X - rapu.X < 300)
+        {
+            rapuElamat.Value -=3;
+        }
+    }
+
+    void rapuiskee()
+    {
+        if(rapu.X - katkis.X < 300)
+        {
+            katkisElamat.Value -=3;
+        }
+
+        if (katkisElamat.Value <= 0)
+        {
+            MessageDisplay.Add("RAPU VOITTI.");
+        }
+        
     }
 
@@ -66 +109 @@
     {
         Level.CreateBorders();
-        Level.Background.CreateGradient(Color.White, Color.SkyBlue);
+        Level.Background.Image = LoadImage("paistinpannukuumana2");
     }
+
+    void katkisTormaa(PhysicsObject katkis, PhysicsObject kohde)
+    {
+        //if (kohde.Tag.ToString() == "pannu")
+        //{
+        //    MessageDisplay.Add("katkikseen osui");
+        //}
+    }
+
+    void rapuTormaa(PhysicsObject rapu, PhysicsObject kohde)
+    {
+
+    }
+    void LuoLaskuri()
+    {
+        pisteLaskuri = new IntMeter(100);
+
+        katkisElamat = new IntMeter(100);
+        rapuElamat = new IntMeter(100);
+
+        Label katkisNaytto = new Label(100.0, 60.0);
+        katkisNaytto.X = Screen.Right - 100;
+        katkisNaytto.Y = Screen.Top - 50;
+        katkisNaytto.TextColor = Color.White;
+        katkisNaytto.Color = Color.Black;
+
+        katkisNaytto.BindTo(katkisElamat);
+        Add(katkisNaytto);
+
+        Label rapuNaytto = new Label(100.0, 60.0);
+        rapuNaytto.X = Screen.Left + 100;
+        rapuNaytto.Y = Screen.Top - 50;
+        rapuNaytto.TextColor = Color.White;
+        rapuNaytto.Color = Color.Black;
+
+        rapuNaytto.BindTo(rapuElamat);
+        Add(rapuNaytto);
+
+    }
+
+    
 
     void AloitaPeli()
     { }
 
-    void LisaaLaskurit()
-    {
-        LuoPisteLaskuri(Screen.Left + 100.0, Screen.Top - 100.0);
-        LuoPisteLaskuri(Screen.Right - 100.0, Screen.Top - 100.0);
+    
 
-    }
 
-    IntMeter LuoPisteLaskuri(double x, double y)
-    {
-        IntMeter laskuri = new IntMeter(0);
-        laskuri.MaxValue = 10;
-        Label naytto = new Label();
-        naytto.BindTo(laskuri);
-        naytto.X = x;
-        naytto.Y = y;
-        naytto.TextColor = Color.White;
-        Add(naytto);
-        return laskuri;
-    }
-
-    void katkisiskee(PlatformCharacter katkis, PlatformCharacter rapu)
-    {
-        if (katkis == rapu)
-        {
-            katkis.Value -= 1;
-        }
-        else if (rapu == katkis)
-        {
-            rapu.Value -= 1;
-        }
-    }