Changeset 5662 for 2014/30

Timestamp:

2014-07-25 09:40:26 (9 years ago)

Author:

sieerinn

Message:

 

Location:

2014/30/AkseliK/BunniesVsHunters

Files:

• BunniesVsHunters.suo (modified) (previous)
• BunniesVsHunters/BunniesVsHunters/BunniesVsHunters.cs (modified) (2 diffs)
• BunniesVsHunters/BunniesVsHunters/bin/x86/Debug/BunniesVsHunters.exe (modified) (previous)
• BunniesVsHunters/BunniesVsHunters/bin/x86/Debug/BunniesVsHunters.pdb (modified) (previous)
• BunniesVsHunters/BunniesVsHunters/bin/x86/Debug/Content/bloodydeath.xnb (deleted)
• BunniesVsHunters/BunniesVsHunters/obj/x86/Debug/BunniesVsHunters.csproj.FileListAbsolute.txt (modified) (1 diff)
• BunniesVsHunters/BunniesVsHunters/obj/x86/Debug/BunniesVsHunters.exe (modified) (previous)
• BunniesVsHunters/BunniesVsHunters/obj/x86/Debug/BunniesVsHunters.pdb (modified) (previous)
• BunniesVsHunters/BunniesVsHunters/obj/x86/Debug/ContentPipeline-{B1CC40CE-BF09-4019-9684-652C700666E1}.xml (modified) (1 diff)
• BunniesVsHunters/BunniesVsHunters/obj/x86/Debug/cachefile-{B1CC40CE-BF09-4019-9684-652C700666E1}-targetpath.txt (modified) (1 diff)
• BunniesVsHunters/BunniesVsHuntersContent/BunniesVsHuntersContent.contentproj (modified) (1 diff)
• BunniesVsHunters/BunniesVsHuntersContent/bloodydeath.png (deleted)

2014/30/AkseliK/BunniesVsHunters/BunniesVsHunters/BunniesVsHunters/BunniesVsHunters.cs

@@ -110 +110 @@
         pelaaja1.Weapon.ProjectileCollision = AmmusOsui;
         AddCollisionHandler(pelaaja1, "tahti", TormaaTahteen);
-        if(
+        AddCollisionHandler(pelaaja1, "vihollinen", TormaaViholliseen);
 
         Add(pelaaja1);
@@ -188 +188 @@
     {
         MessageDisplay.Add("u are now lunch");
+        pelaaja1.Destroy();
     }
-
+    void TormaaViholliseen(PhysicsObject hahmo, PhysicsObject Vihollinen)
+    {
+        elamalaskuri.Value--;
+    }
 }

2014/30/AkseliK/BunniesVsHunters/BunniesVsHunters/BunniesVsHunters/obj/x86/Debug/BunniesVsHunters.csproj.FileListAbsolute.txt

@@ -21 +21 @@
 C:\MyTemp\AkseliK\BunniesVsHunters\BunniesVsHunters\BunniesVsHunters\bin\x86\Debug\Content\puu.xnb
 C:\MyTemp\AkseliK\BunniesVsHunters\BunniesVsHunters\BunniesVsHunters\bin\x86\Debug\Content\kuolo.xnb
-C:\MyTemp\AkseliK\BunniesVsHunters\BunniesVsHunters\BunniesVsHunters\bin\x86\Debug\Content\bloodydeath.xnb
 C:\MyTemp\AkseliK\BunniesVsHunters\BunniesVsHunters\BunniesVsHunters\bin\x86\Debug\Content\plokki.xnb

2014/30/AkseliK/BunniesVsHunters/BunniesVsHunters/BunniesVsHunters/obj/x86/Debug/ContentPipeline-{B1CC40CE-BF09-4019-9684-652C700666E1}.xml

@@ -129 +129 @@
     </Item>
     <Item>
-      <Source>bloodydeath.png</Source>
-      <Name>bloodydeath</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-      <Options>None</Options>
-      <Output>C:\MyTemp\AkseliK\BunniesVsHunters\BunniesVsHunters\BunniesVsHunters\bin\x86\Debug\Content\bloodydeath.xnb</Output>
-      <Time>2014-07-24T13:15:38.8535216+03:00</Time>
-    </Item>
-    <Item>
       <Source>plokki.png</Source>
       <Name>plokki</Name>

2014/30/AkseliK/BunniesVsHunters/BunniesVsHunters/BunniesVsHunters/obj/x86/Debug/cachefile-{B1CC40CE-BF09-4019-9684-652C700666E1}-targetpath.txt

@@ -13 +13 @@
 Content\puu.xnb
 Content\kuolo.xnb
-Content\bloodydeath.xnb
 Content\plokki.xnb

2014/30/AkseliK/BunniesVsHunters/BunniesVsHunters/BunniesVsHuntersContent/BunniesVsHuntersContent.contentproj

@@ -134 +134 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="bloodydeath.png">
-      <Name>bloodydeath</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="plokki.png">
       <Name>plokki</Name>