Changeset 6668

Timestamp:

2015-07-01 13:40:02 (8 years ago)

Author:

jesirkia

Message:

 

Location:

2015/27/JesseS/VoltsTank

Files:

• VoltsTank.suo (modified) (previous)
• VoltsTank/Ammus.png (added)
• VoltsTank/VoltsTank/VoltsTank.cs (modified) (4 diffs)
• VoltsTank/VoltsTank/VoltsTank.csproj.Debug.cachefile (added)
• VoltsTank/VoltsTank/bin/x86/Debug/Content/Ammus.xnb (added)
• VoltsTank/VoltsTank/bin/x86/Debug/VoltsTank.exe (modified) (previous)
• VoltsTank/VoltsTank/bin/x86/Debug/VoltsTank.pdb (modified) (previous)
• VoltsTank/VoltsTank/obj/x86/Debug/ContentPipeline-{2F24256F-9E1A-4769-8E9A-3FFC69AEE13C}.xml (modified) (2 diffs)
• VoltsTank/VoltsTank/obj/x86/Debug/VoltsTank.csproj.FileListAbsolute.txt (modified) (1 diff)
• VoltsTank/VoltsTank/obj/x86/Debug/VoltsTank.exe (modified) (previous)
• VoltsTank/VoltsTank/obj/x86/Debug/VoltsTank.pdb (modified) (previous)
• VoltsTank/VoltsTank/obj/x86/Debug/cachefile-{2F24256F-9E1A-4769-8E9A-3FFC69AEE13C}-targetpath.txt (added)
• VoltsTank/VoltsTankContent/Ammus.png (added)
• VoltsTank/VoltsTankContent/VoltsTankContent.contentproj (modified) (1 diff)

2015/27/JesseS/VoltsTank/VoltsTank/VoltsTank/VoltsTank.cs

@@ -9 +9 @@
 public class VoltsTank : PhysicsGame
 {
+    AssaultRifle pelaajan1Ase;
     PhysicsObject pelaaja1;
     PhysicsObject pelaaja2;
+
+    Image ammuksenKuva = LoadImage("Ammus");
 
     double maxNopeus = 1500.0;
@@ -16 +19 @@
     public override void Begin()
     {
+        IsFullScreen = true;
+
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Quit game");
         ControllerOne.Listen(Button.Back, ButtonState.Pressed, ConfirmExit, "Quit game");
 
+        Grenade kranaatti = new Grenade(4.0);
+
         LuoPelaaja1();
         LuoPelaaja2();
-            
+
+        pelaajan1Ase = new AssaultRifle(30, 10);
+
+        pelaajan1Ase.Ammo.Value = 1000;
+
+        pelaajan1Ase.ProjectileCollision = AmmusOsui;
+
+        pelaaja1.Add(pelaajan1Ase);
        
-
-
         ControllerOne.ListenAnalog(AnalogControl.LeftStick, 0.1,
   LiikutaPelaajaa, "Liikuta pelaajaa tattia pyörittämällä.", pelaaja1);
@@ -37 +49 @@
         AmmuTykilla, "Käytä oikeaa liipasinta ampumisen tavoin.", pelaaja2);
 
+        ControllerOne.Listen(Button.RightTrigger, ButtonState.Down, AmmuAseella, "Ammu", pelaajan1Ase);
+        ControllerOne.Listen(Button.LeftTrigger, ButtonState.Down, AmmuAseella, "Ammu", pelaajan1Ase);
 
+        //ControllerTwo.Listen(Button.RightTrigger, ButtonState.Down, AmmuAseella, "Ammu", pelaajan2Ase);
+        //ControllerTwo.Listen(Button.LeftTrigger, ButtonState.Down, AmmuAseella, "Ammu", pelaajan2Ase);
     }
     void LiikutaPelaajaa(AnalogState tatinTila, PhysicsObject pelaaja)
@@ -66 +82 @@
     }
 
+    void AmmusOsui(PhysicsObject ammus, PhysicsObject kohde)
+    {
+        ammus.Destroy();
+    }
+    void AmmuAseella(AssaultRifle ase)
+    {
+        PhysicsObject ammus = ase.Shoot();
 
+        if (ammus != null)
+        {
+            ammus.Size *= 1;
+            ammus.Image = ammuksenKuva;
+            ammus.MaximumLifetime = TimeSpan.FromSeconds(1.5);
+        }
+        if (ammus != null)
+        {
+            ammus.Size *= 1;
+            ammus.Image = ammuksenKuva;
+            ammus.MaximumLifetime = TimeSpan.FromSeconds(1.5);
+        }
+    }
 }

2015/27/JesseS/VoltsTank/VoltsTank/VoltsTank/obj/x86/Debug/ContentPipeline-{2F24256F-9E1A-4769-8E9A-3FFC69AEE13C}.xml

@@ -2 +2 @@
 <XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline">
   <Asset Type="Pipeline:BuildItemCollection">
+    <Item>
+      <Source>Ammus.png</Source>
+      <Name>Ammus</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\JesseS\VoltsTank\VoltsTank\VoltsTank\bin\x86\Debug\Content\Ammus.xnb</Output>
+      <Time>2015-07-01T13:16:01.1313355+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>
@@ -16 +25 @@
     <Assemblies>
       <Assembly>
+        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key>
+        <Value>2014-11-26T00:23:34+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>2014-11-26T00:23:36+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>2012-07-09T09:25:47.1768662+03:00</Value>

2015/27/JesseS/VoltsTank/VoltsTank/VoltsTank/obj/x86/Debug/VoltsTank.csproj.FileListAbsolute.txt

@@ -7 +7 @@
 C:\MyTemp\JesseS\VoltsTank\VoltsTank\VoltsTank\obj\x86\Debug\VoltsTank.exe
 C:\MyTemp\JesseS\VoltsTank\VoltsTank\VoltsTank\obj\x86\Debug\VoltsTank.pdb
+C:\MyTemp\JesseS\VoltsTank\VoltsTank\VoltsTank\bin\x86\Debug\Content\Ammus.xnb

2015/27/JesseS/VoltsTank/VoltsTank/VoltsTankContent/VoltsTankContent.contentproj

@@ -45 +45 @@
     <Reference Include="AnimationExtension" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Ammus.png">
+      <Name>Ammus</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.