Changeset 5577 for 2014/30


Ignore:
Timestamp:
2014-07-23 12:27:17 (5 years ago)
Author:
athebla
Message:
 
Location:
2014/30/AtteB/Peli
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • 2014/30/AtteB/Peli/Peli/Peli/Peli.cs

    r5574 r5577  
    7676 
    7777    SoundEffect maaliAani = LoadSoundEffect("maali"); 
     78    SoundEffect HowItBegins = LoadSoundEffect("HowItBegins"); 
    7879 
    7980    public override void Begin() 
     
    229230    } 
    230231 
    231     void PelaajaOsuuViholliseen(PhysicsObject pelaaja1, PhysicsObject kohde) 
    232     { 
    233         elämäLaskuri.Value -= 10; 
     232    public void PelaajaOsuuViholliseen(PhysicsObject pelaaja1, PhysicsObject kohde) 
     233    { 
     234        elämäLaskuri.Value -= elämäLaskuri - 10; 
    234235 
    235236        if (elämäLaskuri <= 0) 
     
    237238    } 
    238239 
    239     void PelaajaOsuuHeart(PhysicsObject pelaaja1, PhysicsObject kohde) 
    240     { 
    241         if (elämäLaskuri < 65) 
    242         { 
    243             elämäLaskuri.Value += 30; 
    244         } 
     240    public void PelaajaOsuuHeart(PhysicsObject pelaaja1, PhysicsObject kohde) 
     241    { 
     242        elämäLaskuri.Value += elämäLaskuri + 20; 
    245243    } 
    246244 
     
    269267            ammus.Image = FireBall1; 
    270268            ammus.Size = new Vector(40, 40); 
     269            ammus.MaximumLifetime = TimeSpan.FromSeconds(2.0); 
    271270        } 
     271    } 
     272 
     273    void Tähtää() 
     274    { 
     275        pelaaja1.Weapon.Angle = pelaaja1.FacingDirection.Angle; 
    272276    } 
    273277 
  • 2014/30/AtteB/Peli/Peli/Peli/Peli.csproj.Debug.cachefile

    r5574 r5577  
    1818Content\Clear.xnb 
    1919Content\heart.xnb 
     20Content\HowItBegins.xnb 
     21Content\HowItBegins.wma 
  • 2014/30/AtteB/Peli/Peli/Peli/obj/x86/Debug/ContentPipeline-{2D86B228-748C-44C7-93B1-DCBD6910317C}.xml

    r5574 r5577  
    3636      <Options>None</Options> 
    3737      <Output>C:\MyTemp\AtteB\Peli\Peli\Peli\bin\x86\Debug\Content\kentta1.xnb</Output> 
    38       <Time>2014-07-23T10:47:44.2742229+03:00</Time> 
     38      <Time>2014-07-23T11:52:10.0873113+03:00</Time> 
    3939    </Item> 
    4040    <Item> 
     
    171171      <Options>None</Options> 
    172172      <Output>C:\MyTemp\AtteB\Peli\Peli\Peli\bin\x86\Debug\Content\heart.xnb</Output> 
    173       <Time>2014-07-23T10:48:27.5205471+03:00</Time> 
     173      <Time>2014-07-23T12:02:01.4194386+03:00</Time> 
     174    </Item> 
     175    <Item> 
     176      <Source>HowItBegins.mp3</Source> 
     177      <Name>HowItBegins</Name> 
     178      <Importer>Mp3Importer</Importer> 
     179      <Processor>SongProcessor</Processor> 
     180      <Options>None</Options> 
     181      <Output>C:\MyTemp\AtteB\Peli\Peli\Peli\bin\x86\Debug\Content\HowItBegins.xnb</Output> 
     182      <Extra>C:\MyTemp\AtteB\Peli\Peli\Peli\bin\x86\Debug\Content\HowItBegins.wma</Extra> 
     183      <Time>2014-07-23T11:50:07.3910911+03:00</Time> 
    174184    </Item> 
    175185    <BuildSuccessful>true</BuildSuccessful> 
  • 2014/30/AtteB/Peli/Peli/Peli/obj/x86/Debug/Peli.csproj.FileListAbsolute.txt

    r5574 r5577  
    2626C:\MyTemp\AtteB\Peli\Peli\Peli\bin\x86\Debug\Content\Clear.xnb 
    2727C:\MyTemp\AtteB\Peli\Peli\Peli\bin\x86\Debug\Content\heart.xnb 
     28C:\MyTemp\AtteB\Peli\Peli\Peli\bin\x86\Debug\Content\HowItBegins.xnb 
     29C:\MyTemp\AtteB\Peli\Peli\Peli\bin\x86\Debug\Content\HowItBegins.wma 
  • 2014/30/AtteB/Peli/Peli/Peli/obj/x86/Debug/cachefile-{2D86B228-748C-44C7-93B1-DCBD6910317C}-targetpath.txt

    r5574 r5577  
    1818Content\Clear.xnb 
    1919Content\heart.xnb 
     20Content\HowItBegins.xnb 
     21Content\HowItBegins.wma 
  • 2014/30/AtteB/Peli/Peli/PeliContent/PeliContent.contentproj

    r5574 r5577  
    166166    </Compile> 
    167167  </ItemGroup> 
     168  <ItemGroup> 
     169    <Compile Include="HowItBegins.mp3"> 
     170      <Name>HowItBegins</Name> 
     171      <Importer>Mp3Importer</Importer> 
     172      <Processor>SongProcessor</Processor> 
     173    </Compile> 
     174  </ItemGroup> 
    168175  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    169176  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
  • 2014/30/AtteB/Peli/Peli/PeliContent/kentta1.txt

    r5574 r5577  
    55 N 
    66????? 
    7 ?????? 
    8 ???????......H.......?.....?. 
     7??????.......H.......................................... 
     8???????..............?.....?. 
    99????????.............?..S..?.                                   
    1010########################################################### 
Note: See TracChangeset for help on using the changeset viewer.