Changeset 5244 for 2014/27

Timestamp:

2014-07-01 14:56:25 (9 years ago)

Author:

nieekrva

Message:

vihun aseistus kesken

Location:

2014/27/NikiV/untitled

Files:

• untitled.suo (modified) (previous)
• untitled/untitled/bin/x86/Debug/Content/exp_gem.xnb (added)
• untitled/untitled/bin/x86/Debug/untitled.exe (modified) (previous)
• untitled/untitled/bin/x86/Debug/untitled.pdb (modified) (previous)
• untitled/untitled/obj/x86/Debug/ContentPipeline-{55E0D8F8-FAC8-4519-84A8-18979ABAD7C1}.xml (modified) (1 diff)
• untitled/untitled/obj/x86/Debug/cachefile-{55E0D8F8-FAC8-4519-84A8-18979ABAD7C1}-targetpath.txt (modified) (1 diff)
• untitled/untitled/obj/x86/Debug/untitled.csproj.FileListAbsolute.txt (modified) (1 diff)
• untitled/untitled/obj/x86/Debug/untitled.exe (modified) (previous)
• untitled/untitled/obj/x86/Debug/untitled.pdb (deleted)
• untitled/untitled/untitled.cs (modified) (13 diffs)
• untitled/untitled/untitled.csproj.Debug.cachefile (modified) (1 diff)
• untitled/untitledContent/crystal.png (added)
• untitled/untitledContent/exp_gem.png (added)
• untitled/untitledContent/ruby.png (added)
• untitled/untitledContent/untitledContent.contentproj (modified) (1 diff)

2014/27/NikiV/untitled/untitled/untitled/obj/x86/Debug/ContentPipeline-{55E0D8F8-FAC8-4519-84A8-18979ABAD7C1}.xml

@@ -65 +65 @@
       <Time>2014-07-01T10:50:07.7769891+03:00</Time>
     </Item>
+    <Item>
+      <Source>exp_gem.png</Source>
+      <Name>exp_gem</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\NikiV\untitled\untitled\untitled\bin\x86\Debug\Content\exp_gem.xnb</Output>
+      <Time>2014-07-01T13:19:42.5608366+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>

2014/27/NikiV/untitled/untitled/untitled/obj/x86/Debug/cachefile-{55E0D8F8-FAC8-4519-84A8-18979ABAD7C1}-targetpath.txt

@@ -6 +6 @@
 Content\lieska.xnb
 Content\bowser.xnb
+Content\exp_gem.xnb

2014/27/NikiV/untitled/untitled/untitled/obj/x86/Debug/untitled.csproj.FileListAbsolute.txt

@@ -14 +14 @@
 C:\MyTemp\NikiV\untitled\untitled\untitled\bin\x86\Debug\Content\bowser.xnb
 C:\MyTemp\NikiV\untitled\untitled\untitled\bin\x86\Debug\Content\lieska.xnb
+C:\MyTemp\NikiV\untitled\untitled\untitled\bin\x86\Debug\Content\exp_gem.xnb

2014/27/NikiV/untitled/untitled/untitled/untitled.cs

@@ -21 +21 @@
     Image tahtiKuva = LoadImage("tahti");
     Image vihunkuva = LoadImage("bowser");
+    Image lieska = LoadImage("lieska");
+    Image geminkuva = LoadImage("exp_gem");
 
     SoundEffect maaliAani = LoadSoundEffect("maali");
-
+    Weapon vihunase;
     public override void Begin()
     {
@@ -43 +45 @@
         kentta.SetTileMethod('N', LisaaPelaaja);
         kentta.SetTileMethod('b', Luovihu);
+        kentta.SetTileMethod('g', lisaagem);
         kentta.Execute(RUUDUN_KOKO, RUUDUN_KOKO);
         Level.CreateBorders();
@@ -65 +68 @@
         Add(tahti);
     }
+    void lisaagem(Vector paikka, double leveys, double korkeus)
+    {
+        PhysicsObject gem = PhysicsObject.CreateStaticObject(leveys, korkeus);
+        gem.IgnoresCollisionResponse = true;
+        gem.Position = paikka;
+        gem.Image = geminkuva;
+        gem.Tag = "gem";
+        Add(gem);
+
+    }
+
+       
+    
+
+
+
 
     void LisaaPelaaja(Vector paikka, double leveys, double korkeus)
@@ -73 +92 @@
         pelaaja1.Image = pelaajanKuva;
         AddCollisionHandler(pelaaja1, "tahti", TormaaTahteen);
+        AddCollisionHandler(pelaaja1, "gem", tormaagemiin);
         Add(pelaaja1);
         pelaajan1Ase = new AssaultRifle(30, 10);
@@ -79 +99 @@
         pelaajan1Ase.Ammo.Value = 1000;
 
-     
+
 
         pelaaja1.Add(pelaajan1Ase);
@@ -92 +112 @@
         vihu.Image = vihunkuva;
         vihu.CanRotate = false;
+        vihunase = new AssaultRifle(50, 60);
+        vihunase.Color = Color.Transparent;
+        vihunase.Image = null;
+        vihu.Weapon = vihunase;
+        Timer ajastin = new Timer();
+        ajastin.Interval = 1.5;
+        ajastin.Timeout += vihunase.Shoot;
+        ajastin.Start();
         Add(vihu);
 
@@ -101 +129 @@
         tasoAivot.JumpSpeed = 700;
         tasoAivot.TriesToJump = true;
-       
+
 
     }
@@ -110 +138 @@
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
 
-        Keyboard.Listen(Key.Left, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja1, -nopeus);
-        Keyboard.Listen(Key.Right, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja1, nopeus);
-        Keyboard.Listen(Key.Up, ButtonState.Pressed, Hyppaa, "Pelaaja hyppää", pelaaja1, hyppyNopeus);
+        Keyboard.Listen(Key.A, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja1, -nopeus);
+        Keyboard.Listen(Key.D, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja1, nopeus);
+        Keyboard.Listen(Key.W, ButtonState.Pressed, Hyppaa, "Pelaaja hyppää", pelaaja1, hyppyNopeus);
         Keyboard.Listen(Key.Space, ButtonState.Down, AmmuAseella, "Ammu", pelaajan1Ase);
 
@@ -140 +168 @@
         tahti.Destroy();
     }
+    void tormaagemiin(PhysicsObject hahmo, PhysicsObject gem)
+    {
+        MessageDisplay.Add("100 exp. gained!");
+        gem.Destroy();
+    }
+
     void AmmuAseella(AssaultRifle ase)
     {
@@ -150 +184 @@
             //ammus.Image = ...
             ammus.MaximumLifetime = TimeSpan.FromSeconds(1.0);
-            
+
         }
     }
@@ -156 +190 @@
     {
         AddCollisionHandler(ammus, vihu, osuma);
-        
+
     }
     void LuoElamaLaskuri()
@@ -173 +207 @@
     void ElamaLoppui()
     {
-        MessageDisplay.Add("Elämät loppuivat, voi voi.");
-    }
+        MessageDisplay.Add("Game over!");
+    }
+    
+
     void osuma(PhysicsObject ammus, PlatformCharacter vihu)
     {
@@ -181 +217 @@
     }
 
+    void vihuampuu(PlatformCharacter vihu)
+    {
+        PhysicsObject ammus = vihu.Weapon.Shoot();
+
+        if (ammus != null)
+        {
+            //ammus.Size *= 3;
+            ammus.Image = lieska;
+            //ammus.MaximumLifetime = TimeSpan.FromSeconds(2.0);
+        }
+    }
+
+
+
+
+
+
+
+
 }

2014/27/NikiV/untitled/untitled/untitled/untitled.csproj.Debug.cachefile

@@ -6 +6 @@
 Content\lieska.xnb
 Content\bowser.xnb
+Content\exp_gem.xnb

2014/27/NikiV/untitled/untitled/untitledContent/untitledContent.contentproj

@@ -88 +88 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="exp_gem.png">
+      <Name>exp_gem</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.