Changeset 7717 for 2016/27/OskariL/Pong/Pong

Timestamp:

2016-07-04 14:54:28 (7 years ago)

Author:

karkaite

Message:

 

Location:

2016/27/OskariL/Pong/Pong

Files:

• Pong/Pong.cs (modified) (6 diffs)
• Pong/bin/x86/Debug/Pong.exe (modified) (previous)
• Pong/bin/x86/Debug/Pong.pdb (modified) (previous)
• Pong/obj/x86/Debug/ContentPipeline-{BFDFC922-70FE-421D-A674-E0C408BE6EAF}.xml (modified) (2 diffs)
• Pong/obj/x86/Debug/Pong.csproj.FileListAbsolute.txt (modified) (1 diff)
• Pong/obj/x86/Debug/Pong.exe (modified) (previous)
• Pong/obj/x86/Debug/Pong.pdb (modified) (previous)
• PongContent/PongContent.contentproj (modified) (1 diff)

2016/27/OskariL/Pong/Pong/Pong/Pong.cs

@@ -9 +9 @@
 public class Pong : PhysicsGame
 {
+    ExplosionSystem rajahtaa = new ExplosionSystem(LoadImage("Pulla"), 200);
+
     Vector nopeusYlos = new Vector(0, 650);
     Vector nopeusAlas = new Vector(0, -650);
@@ -23 +25 @@
 
     Boolean hasGameEnded = false;
+    Boolean hasRajahtanyt = false;
 
     DoubleMeter alaspainLaskuri;
@@ -156 +159 @@
         {
             pelaajan1Pisteet.Value += 1;
-            Explosion rajahdys = new Explosion(200);
-            rajahdys.Position = pallo.Position;
-            Add(rajahdys);           
+            Rajahdys();
         }
         else if (kohde == vasenReuna)
         {
             pelaajan2Pisteet.Value += 1;
-            Explosion rajahdys = new Explosion(200);
-            rajahdys.Position = pallo.Position;
-            Add(rajahdys);
+            Rajahdys();
+            //TODO: tee erillinen räjähdys Putineista
         }
         if (pelaajan1Pisteet == 10)
@@ -171 +171 @@
             MessageDisplay.Add("Pelaaja 1 voittaa");
             LuoAikaLaskuri();
+            Rajahdys();
         }
         else if (pelaajan2Pisteet == 10)
@@ -176 +177 @@
             MessageDisplay.Add("Pelaaja 2 voittaa");
             LuoAikaLaskuri();
+            Rajahdys();
+            //TODO: tee erillinen räjähdys Putineista
+
         }
     }
@@ -211 +215 @@
         base.Update(time);
     }
-
+    void Rajahdys()
+    {
+        if (hasRajahtanyt == false)
+        {
+            hasRajahtanyt = true;
+            Add(rajahtaa);
+        }
+        double x = 0;
+        double y = 0;
+        int pMaara = 200;
+        rajahtaa.AddEffect(x, y, pMaara);
+    }
 }

2016/27/OskariL/Pong/Pong/Pong/obj/x86/Debug/ContentPipeline-{BFDFC922-70FE-421D-A674-E0C408BE6EAF}.xml

@@ -2 +2 @@
 <XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline">
   <Asset Type="Pipeline:BuildItemCollection">
+    <Item>
+      <Source>Pulla.png</Source>
+      <Name>Pulla</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\OskariL\Pong\Pong\Pong\bin\x86\Debug\Content\Pulla.xnb</Output>
+      <Time>2016-07-04T14:24:56.5987405+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>
@@ -16 +25 @@
     <Assemblies>
       <Assembly>
+        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key>
+        <Value>2015-02-09T20:18:44+02:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key>
+        <Value>2015-02-17T22:27:18+02:00</Value>
+      </Assembly>
+      <Assembly>
         <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
         <Value>2015-09-16T18:36:58.6261942+03:00</Value>

2016/27/OskariL/Pong/Pong/Pong/obj/x86/Debug/Pong.csproj.FileListAbsolute.txt

@@ -7 +7 @@
 C:\MyTemp\OskariL\Pong\Pong\Pong\obj\x86\Debug\Pong.exe
 C:\MyTemp\OskariL\Pong\Pong\Pong\obj\x86\Debug\Pong.pdb
+C:\MyTemp\OskariL\Pong\Pong\Pong\bin\x86\Debug\Content\Pulla.xnb

2016/27/OskariL/Pong/Pong/PongContent/PongContent.contentproj

@@ -45 +45 @@
     <Reference Include="AnimationExtension" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Pulla.png">
+      <Name>Pulla</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.