Changeset 1217 for 2010

Timestamp:

2010-07-09 12:21:46 (13 years ago)

Author:

vekakart

Message:

lisäsin jotakin

Location:

2010/27/Vekakart

Files:

• Catch The Rainbow/Catch The Rainbow/Catch The Rainbow.csproj (modified) (1 diff)
• Catch The Rainbow/Catch The Rainbow/Content/Content.contentproj (modified) (1 diff)
• Catch The Rainbow/Catch The Rainbow/Content/Crossword.png (added)
• Catch The Rainbow/Catch The Rainbow/Content/Knife1.png (added)
• Catch The Rainbow/Catch The Rainbow/Content/Knife5.png (added)
• Catch The Rainbow/Catch The Rainbow/Content/Max Mechanic D.png (added)
• Catch The Rainbow/Catch The Rainbow/Content/Max Mechanic Kuollut.png (added)
• Catch The Rainbow/Catch The Rainbow/Crossword2.png (deleted)
• Catch The Rainbow/Catch The Rainbow/Crossword_hand.png (deleted)
• Catch The Rainbow/Catch The Rainbow/Knife1.png (deleted)
• Catch The Rainbow/Catch The Rainbow/Max Mechanic D.png (added)
• Catch The Rainbow/Catch The Rainbow/Peli.cs (modified) (7 diffs)
• Max Mechanic Kuollut.png (added)

2010/27/Vekakart/Catch The Rainbow/Catch The Rainbow/Catch The Rainbow.csproj

@@ -89 +89 @@
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Crossword_hand.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Game.ico" />
     <Content Include="GameThumbnail.png" />

2010/27/Vekakart/Catch The Rainbow/Catch The Rainbow/Content/Content.contentproj

@@ -41 +41 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Crossword.png">
+      <Name>Crossword</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Knife1.png">
+      <Name>Knife1</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Max Mechanic D.png">
+      <Name>Max Mechanic D</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
 </Project>

2010/27/Vekakart/Catch The Rainbow/Catch The Rainbow/Peli.cs

@@ -13 +13 @@
 
     PhysicsObject Crossword;
+    PhysicsObject Chandler;
 
     PlatformCharacter Max;
@@ -18 +19 @@
     protected override void Begin()
     {
-        LuoMax();
+        ClearAll();
+        //LuoMax();
         AsetaOhjaimet();
         LuoKentta();
@@ -25 +27 @@
     void LuoKentta()
     {
-        Camera.FollowedObject = Max;
+        
 
         TileMap ruudut = TileMap.FromFile("Kentta 1.txt");
@@ -31 +33 @@
         ruudut['C'] = LuoRainbow;
         ruudut['J'] = LuoCrossword;
+        ruudut['9'] = LuoChandler;
+        ruudut['1'] = LuoMax;
         ruudut.Insert(ruudunleveys, ruudunkorkeus);
 
         Gravity = new Vector(0.0, -800.0);
-        
+        Camera.FollowedObject = Max;
     }
     PhysicsObject LuoPalikka()
@@ -49 +53 @@
     }
 
-    void LuoMax()
+   PhysicsObject LuoMax()
     {
         Max = new PlatformCharacter(35,45);
         Max.Restitution = 0.0;
         Max.CanRotate = false;
-        Max.X = -450;
-        Max.Y = -365;
         Max.Image = Image.FromFile("Max Mechanic.png");
         Max.KineticFriction = 0.0;
-        Add (Max);
-        return;
+        Max.Tag = "Max";
+       // Add(Max);
+        return Max;
     }
 
@@ -98 +101 @@
     {
         Crossword = new PhysicsObject(35.0, 45.0);
-        Crossword.Image = Image.FromFile("Crossword_hand.png");
+        Crossword.Image = Image.FromFile("Crossword.png");
 
         Timer ajastin = new Timer();
         ajastin.Tag = Crossword;
-        ajastin.Interval = 1;
+        ajastin.Interval = 0.1;
         ajastin.Trigger += Tekoaly;
         Add (ajastin);
@@ -116 +119 @@
             etaisyys = etaisyys * -1;
         }
-        if (etaisyys < 150)
+        if (etaisyys < 200 && voiheittaa && vihollinen.Y > Max.Y)
         {
-            vihollinen.Image = LoadImage("Crossword2");
+            if (vihollinen.X < Max.X)
+            {
+                vihollinen.Image = LoadImage("Crossword2");
+                PhysicsObject Ase = LuoPuukko();
+                Ase.Image = LoadImage("knife1");
+                Ase.X = vihollinen.X+20;
+                Ase.Y = vihollinen.Y;
+                Ase.Hit(new Vector(500, 0));
+                Add(Ase);
+                
+                
+            }
+            else
+            {
+                vihollinen.Image = LoadImage("Crossword");
+                PhysicsObject Ase = LuoPuukko();
+                Ase.Image = LoadImage("knife1");
+                Ase.X = vihollinen.X-20;
+                Ase.Y = vihollinen.Y;
+                Ase.Hit(new Vector(-500, 0));
+                Add(Ase);
+            }
+            voiheittaa = false;
+            Timer.SingleShot(1, saaheittaa);
         }
         sender.Start();
     }
+    PhysicsObject LuoChandler()
+    {
+        Chandler = new PhysicsObject(20, 45);
+        //Chandler.Image = LoadImage ("Chandler1")
+        return Chandler;
+    }
+    PhysicsObject LuoPuukko()
+    {
+        PhysicsObject Puukko = new PhysicsObject(20.0, 5.0);
+        Puukko.MaximumLifetime = TimeSpan.FromSeconds(1);
+        AddCollisionHandler(Puukko, KasittelePuukonTormays);
+        Puukko.Tag = "p";
+        return Puukko;
+    }
 
+    void KasittelePuukonTormays(PhysicsObject puukko, PhysicsObject kohde)
+    {
+        if (kohde.Tag.ToString() == "Max")
+        {
+            Timer.SingleShot(1.5, Begin);
+            Max.Image = LoadImage("Max Mechanic D");
+            ClearControls();
+        }
+
+    }
+    bool voiheittaa = true;
+
+    void saaheittaa()
+    {
+        voiheittaa = true;
+    }
 }