Changeset 5032 for 2014/24


Ignore:
Timestamp:
2014-06-13 11:50:07 (8 years ago)
Author:
eetakoiv
Message:
 
Location:
2014/24/EelisK/War_in_the_sky
Files:
71 added
12 edited

Legend:

Unmodified
Added
Removed

  • 2014/24/EelisK/War_in_the_sky/War_in_the_sky/War_in_the_sky/Lentokone.cs

    r5002 r5032  
    8181        AmmusNaytto.Position = new Vector(elamaPalkki.X, elamaPalkki.Y + elamaPalkki.Height); 
    8282        AmmusNaytto.Font = War_in_the_sky.Peli.courier; 
     83        AmmusNaytto.Title = "Ammo"; 
    8384        War_in_the_sky.Peli.Add(AmmusNaytto); 
    8485 
    … …  
    8788        PisteNaytto.Position = new Vector(War_in_the_sky.Screen.Left + 150, War_in_the_sky.Screen.Bottom + 35); 
    8889        PisteNaytto.Font = War_in_the_sky.Peli.courier; 
     90        PisteNaytto.Title = "Money"; 
    8991        War_in_the_sky.Peli.Add(PisteNaytto); 
    9092 
    … …  
    100102       
    101103        Timer.SingleShot(0.5, delegate { War_in_the_sky.Peli.PimennaRuutua(0.04); }); 
    102         Timer.SingleShot(10.0, delegate { War_in_the_sky.Peli.ClearAll(); War_in_the_sky.Peli.PaaValikko(null); }); 
     104        Timer.SingleShot(10.0, delegate 
     105        { 
     106            War_in_the_sky.Peli.ClearAll(); War_in_the_sky.Peli.PaaValikko(null); War_in_the_sky.Peli.MediaPlayer.Stop(); 
     107        }); 
    103108 
    104109        SoundEffect loppuLopetus = War_in_the_sky.LoadSoundEffect("Game_Over_sound_effect"); 

  • 2014/24/EelisK/War_in_the_sky/War_in_the_sky/War_in_the_sky/War_in_the_sky.cs

    r5002 r5032  
    2121    int round = 1; 
    2222    SoundEffect taustaAani = War_in_the_sky.LoadSoundEffect("War Music (Epic Instrumental)_leikattu"); 
     23     
    2324    public Font courier = LoadFont("Courier"); 
    2425    IntMeter kierrosMittari; 
    … …  
    6364    public void PimennaRuutua(double nopeus) 
    6465    { 
    65         taustaAani.Play(); 
    6666        Timer ajastin = new Timer(); 
    6767        ajastin.Interval = 0.1; 
    … …  
    100100    public void PaaValikko(GameObject taustakuva) 
    101101    { 
    102         SoundEffect taustaAani = War_in_the_sky.LoadSoundEffect("War Music (Epic Instrumental)_leikattu"); 
     102 
    103103        //MediaPlayer.Play("War Music (Epic Instrumental)_leikattu"); 
    104          
     104        taustaAani.Play(); 
    105105         
    106106        if (taustakuva != null) 
    107107            taustakuva.Destroy(); 
    108108        Level.Background.Color = Color.Black; 
    109         KirkastaRuutua(0.2, 1.0); 
     109        if (Level.AmbientLight < 1.0) 
     110            KirkastaRuutua(0.2, 1.0); 
    110111        MultiSelectWindow alkuValikko = new MultiSelectWindow("War In The Sky", 
    111112        "Start Game", "Info", "End Game"); 
    … …  
    117118        alkuValikko.DefaultCancel = 2; 
    118119         
    119  
    120  
    121120        GameObject valikkoTausta = new GameObject(340, 400); 
    122121        valikkoTausta.Image = LoadImage("Alku valikko"); 
    … …  
    124123        Mouse.IsCursorVisible = false; 
    125124        alkuValikko.AddItemHandler(0, delegate { AlustaPeli(); valikkoTausta.Destroy(); }); 
     125        alkuValikko.AddItemHandler(1, delegate { valikkoTausta.Destroy(); }); 
     126        //alkuValikko.AddItemHandler(1, Info); 
    126127        //alkuValikko.AddItemHandler(1, d); 
    127         alkuValikko.AddItemHandler(1, Exit); 
    128128         
    129129 
    … …  
    199199            LuoPilvi(RandomGen.NextVector(Level.Left, Level.Bottom, Level.Right, Level.Top)); 
    200200        } 
    201  
     201        taustaAani.Stop(); 
     202        if (RandomGen.NextBool()) 
     203            MediaPlayer.Play("War Thunder"); 
     204        else 
     205            MediaPlayer.Play("War Thunder_2"); 
     206        MediaPlayer.IsRepeating = true; 
    202207    } 
    203208 
    … …  
    299304        ammus.Size = new Vector(25.0, 5.0); 
    300305        ammus.Image = null; 
    301         ammus.Color = Color.DarkOrange; 
     306        ammus.Color = Color.Gray; 
    302307 
    303308        ammus.MaximumLifetime = TimeSpan.FromSeconds(0.7); 
    … …  
    535540        switch (valinta) 
    536541        { 
    537  
    538  
    539  
    540542            case 0: 
    541  
     543                break; 
     544            case 1: 
     545                Info(); 
     546                break; 
     547            case 2: 
     548                Exit(); 
    542549                break; 
    543550 
    544551            default: 
    545                 Exit(); 
    546552                break; 
    547553        } 
    … …  
    562568        latausTeksti.IsVisible = true; 
    563569        LatausAani.Play(); 
     570        Timer t = new Timer(); 
     571        t.Interval = LatausAani.Duration.Seconds; 
     572        t.Timeout += delegate { LatausAani.Play(); }; 
     573        t.Start(); 
     574 
    564575        Timer.SingleShot(5.0, lentokone.LataaAmmo); 
    565         Timer.SingleShot(5.0, delegate { latausTeksti.IsVisible = false; }); 
     576        Timer.SingleShot(5.0, delegate { latausTeksti.IsVisible = false; t.Stop(); }); 
    566577    } 
    567578    void KierrosMittari() 
    … …  
    579590 
    580591    } 
     592 
     593    void Info() 
     594    { 
     595        MessageWindow info = new MessageWindow("TroLOLOLOLOLOLOLLLLLLOLOLOLOLO "); 
     596        info.OKButton.Text = "Takaisin"; 
     597        info.Closed += delegate { PaaValikko(null); }; 
     598        info.Color = Color.Brown; 
     599        info.ActiveColor = Color.Transparent; 
     600        info.Message.TextColor = Color.White; 
     601        Add(info); 
     602    } 
    581603} 

  • 2014/24/EelisK/War_in_the_sky/War_in_the_sky/War_in_the_sky/War_in_the_sky.csproj.Debug.cachefile

    r5002 r5032  
    3434Content\lentsikka lentÀÀ.xnb 
    3535Content\Loading Ammo.xnb 
     36Content\War Thunder_2.xnb 
     37Content\War Thunder.xnb 
    3638Content\Game Over sound effect33.wma 
     39Content\War Thunder_2.wma 
     40Content\War Thunder.wma 

  • 2014/24/EelisK/War_in_the_sky/War_in_the_sky/War_in_the_sky/obj/x86/Debug/ContentPipeline-{513E9BF6-92B1-4B3B-AD5A-0D180EA61427}.xml

    r5002 r5032  
    317317      <Output>C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\Loading Ammo.xnb</Output> 
    318318      <Time>2014-06-12T14:54:43.6468862+03:00</Time> 
     319    </Item> 
     320    <Item> 
     321      <Source>War Thunder_2.mp3</Source> 
     322      <Name>War Thunder_2</Name> 
     323      <Importer>Mp3Importer</Importer> 
     324      <Processor>SongProcessor</Processor> 
     325      <Options>None</Options> 
     326      <Output>C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\War Thunder_2.xnb</Output> 
     327      <Extra>C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\War Thunder_2.wma</Extra> 
     328      <Time>2014-06-13T10:49:37.5995509+03:00</Time> 
     329    </Item> 
     330    <Item> 
     331      <Source>War Thunder.mp3</Source> 
     332      <Name>War Thunder</Name> 
     333      <Importer>Mp3Importer</Importer> 
     334      <Processor>SongProcessor</Processor> 
     335      <Options>None</Options> 
     336      <Output>C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\War Thunder.xnb</Output> 
     337      <Extra>C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\War Thunder.wma</Extra> 
     338      <Time>2014-06-13T10:48:42.535045+03:00</Time> 
    319339    </Item> 
    320340    <BuildSuccessful>true</BuildSuccessful> 

  • 2014/24/EelisK/War_in_the_sky/War_in_the_sky/War_in_the_sky/obj/x86/Debug/War_in_the_sky.csproj.FileListAbsolute.txt

    r5002 r5032  
    4343C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\lentsikka lentÀÀ.xnb 
    4444C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\Loading Ammo.xnb 
     45C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\War Thunder_2.xnb 
     46C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\War Thunder.xnb 
     47C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\War Thunder_2.wma 
     48C:\MyTemp\EelisK\War_in_the_sky\War_in_the_sky\War_in_the_sky\bin\x86\Debug\Content\War Thunder.wma 

  • 2014/24/EelisK/War_in_the_sky/War_in_the_sky/War_in_the_sky/obj/x86/Debug/cachefile-{513E9BF6-92B1-4B3B-AD5A-0D180EA61427}-targetpath.txt

    r5002 r5032  
    3535Content\lentsikka lentÀÀ.xnb 
    3636Content\Loading Ammo.xnb 
     37Content\War Thunder_2.xnb 
     38Content\War Thunder_2.wma 
     39Content\War Thunder.xnb 
     40Content\War Thunder.wma 

  • 2014/24/EelisK/War_in_the_sky/War_in_the_sky/War_in_the_skyContent/War_in_the_skyContent.contentproj

    r5002 r5032  
    222222    </Compile> 
    223223  </ItemGroup> 
     224  <ItemGroup> 
     225    <Compile Include="War Thunder_2.mp3"> 
     226      <Name>War Thunder_2</Name> 
     227      <Importer>Mp3Importer</Importer> 
     228      <Processor>SongProcessor</Processor> 
     229    </Compile> 
     230  </ItemGroup> 
     231  <ItemGroup> 
     232    <Compile Include="War Thunder.mp3"> 
     233      <Name>War Thunder</Name> 
     234      <Importer>Mp3Importer</Importer> 
     235      <Processor>SongProcessor</Processor> 
     236    </Compile> 
     237  </ItemGroup> 
    224238  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    225239  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
Note: See TracChangeset for help on using the changeset viewer.