Changeset 8534 for 2016


Ignore:
Timestamp:
2017-06-12 14:59:31 (3 years ago)
Author:
npo17_0
Message:
 
Location:
2016/27/PaavoH/UltimateAdventure
Files:
4 added
13 edited

Legend:

Unmodified
Added
Removed

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/UltimateAdventure.cs

    r8511 r8534  
    4444    Image WizParticle = LoadImage("WizardingParticle"); 
    4545    Image AchivementBottom = LoadImage("AchivementBottom"); 
     46    //Image marsstone = LoadImage("marsstone"); 
     47    Image OxygenBottleImage = LoadImage("OxygenBottle"); 
    4648 
    4749    SoundEffect maaliAani = LoadSoundEffect("maali"); 
    … …  
    107109        GameObject Achivementbottom = new GameObject(300,70); 
    108110        int Acloop = 0; 
    109         while (Acloop = 10) 
    110         { 
    111             Achivementbottom.Y = Level.Top - 100; 
    112             Achivementbottom.Image = AchivementBottom; 
    113             Add(Achivementbottom); 
    114         } 
     111        while (Acloop < 11) 
     112        { 
     113            Achivementbottom.Y = Level.Top - 100 * Acloop; 
     114            Acloop = Acloop + 1; 
     115        } 
     116        Achivementbottom.Image = AchivementBottom; 
     117        Add(Achivementbottom); 
     118        BackButton(); 
    115119        Logo.Destroy(); 
    116         BackButton(); 
    117120        IsMouseVisible = true; 
    118121    } 
    … …  
    285288        level.SetTileMethod('C', Moonstone); 
    286289        level.SetTileMethod('N', Ninja); 
     290        level.SetTileMethod('H', OxygenBottle); 
    287291        level.Execute(RUUDUN_KOKO, RUUDUN_KOKO); 
    288292        Level.CreateBorders(); 
    … …  
    390394        Add(healt); 
    391395    } 
     396 
    392397    void LisaaPommipakkaus(Vector paikka, double leveys, double korkeus) 
    393398    { 
    … …  
    426431    } 
    427432 
    428  
    429     void LisaaMob(Vector paikka, double leveys, double korkeus, double massa, string tag, Brain aivo, Image kuva) 
     433    void OxygenBottle(Vector paikka, double leveys, double korkeus) 
     434    { 
     435        PhysicsObject OxygenBottle = PhysicsObject.CreateStaticObject(leveys / 2, korkeus / 2); 
     436        OxygenBottle.IgnoresCollisionResponse = true; 
     437        OxygenBottle.Position = paikka; 
     438        OxygenBottle.Tag = "OxygenBottle"; 
     439        OxygenBottle.Image = OxygenBottleImage; 
     440        Add(OxygenBottle); 
     441    } 
     442 
     443 
     444        void LisaaMob(Vector paikka, double leveys, double korkeus, double massa, string tag, Brain aivo, Image kuva) 
    430445    { 
    431446        PlatformCharacter Mob = new PlatformCharacter(leveys, korkeus); 
    … …  
    529544 
    530545        ControllerOne.ListenAnalog(AnalogControl.LeftStick, 0.1, LiikutaPelaajaa, "Liikuta pelaajaa tattia pyörittämällä."); 
    531         ControllerOne.Listen(Button.A, ButtonState.Pressed, Hyppaa, "Pelaaja hyppää", pelaaja1, JumpSpeed); 
     546        ControllerOne.Listen(Button.A, ButtonState.Pressed, Hyppaa, "", pelaaja1, JumpSpeed); 
     547        ControllerOne.Listen(Button.A, ButtonState.Down, Ui, "", pelaaja1); 
    532548        ControllerOne.Listen(Button.RightShoulder, ButtonState.Pressed, HeitaPommi, "Pelaaja heittää pommin", pelaaja1); 
    533549        ControllerOne.Listen(Button.LeftShoulder, ButtonState.Pressed, Lyo, "Pelaaja Lyö", pelaaja1); 

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/UltimateAdventure.csproj.Debug.cachefile

    r8511 r8534  
    11Content\maali.xnb 
    22Content\WizardZap.xnb 
    3 Content\norsu.xnb 
    43Content\tahti.xnb 
    54Content\silmamob.xnb 
    … …  
    5756Content\ruoska.xnb 
    5857Content\Backroundmusic.xnb 
     58Content\OxygenBottle.xnb 
     59Content\Mars.xnb 
    5960Content\Backroundmusic.wma 

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/obj/x86/Debug/ContentPipeline-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}.xml

    r8511 r8534  
    459459      <Options>None</Options> 
    460460      <Output>C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\kentta1.xnb</Output> 
    461       <Time>2017-06-12T09:55:58.1315275+03:00</Time> 
     461      <Time>2017-06-12T14:53:27.6535042+03:00</Time> 
    462462    </Item> 
    463463    <Item> 
    … …  
    541541      <Time>2017-06-12T09:55:59.2105144+03:00</Time> 
    542542    </Item> 
     543    <Item> 
     544      <Source>OxygenBottle.png</Source> 
     545      <Name>OxygenBottle</Name> 
     546      <Importer>TextureImporter</Importer> 
     547      <Processor>TextureProcessor</Processor> 
     548      <Options>None</Options> 
     549      <Output>C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\OxygenBottle.xnb</Output> 
     550      <Time>2017-06-12T14:29:01.3798083+03:00</Time> 
     551    </Item> 
     552    <Item> 
     553      <Source>Mars.txt</Source> 
     554      <Name>Mars</Name> 
     555      <Importer>TextFileImporter</Importer> 
     556      <Processor>TextFileContentProcessor</Processor> 
     557      <Options>None</Options> 
     558      <Output>C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\Mars.xnb</Output> 
     559      <Time>2017-06-12T14:51:49.1480787+03:00</Time> 
     560    </Item> 
    543561    <BuildSuccessful>true</BuildSuccessful> 
    544562    <Settings> 

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/obj/x86/Debug/UltimateAdventure.csproj.FileListAbsolute.txt

    r8511 r8534  
    6565C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\NinjaLVL.xnb 
    6666C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\NinjaThings.xnb 
     67C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\OxygenBottle.xnb 
     68C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\Mars.xnb 

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/obj/x86/Debug/cachefile-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}-targetpath.txt

    r8511 r8534  
    5757Content\Backroundmusic.xnb 
    5858Content\Backroundmusic.wma 
     59Content\OxygenBottle.xnb 
     60Content\Mars.xnb 

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventureContent/UltimateAdventureContent.contentproj

    r8511 r8534  
    383383    </Compile> 
    384384  </ItemGroup> 
     385  <ItemGroup> 
     386    <Compile Include="Mars.txt"> 
     387      <Name>Mars</Name> 
     388      <Importer>TextFileImporter</Importer> 
     389      <Processor>TextFileContentProcessor</Processor> 
     390    </Compile> 
     391  </ItemGroup> 
     392  <ItemGroup> 
     393    <Compile Include="OxygenBottle.png"> 
     394      <Name>OxygenBottle</Name> 
     395      <Importer>TextureImporter</Importer> 
     396      <Processor>TextureProcessor</Processor> 
     397    </Compile> 
     398  </ItemGroup> 
    385399  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    386400  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventureContent/kentta1.txt

    r8405 r8534  
    1414#                                                                                 # 
    1515#                                                        &UUUUUUU&&               # 
    16 #                                                        &UUUUUUU&&               # 
     16#                                                   H    &UUUUUUU&&               # 
    1717#                               &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&      # 
    1818#                         &&&                                                     # 
Note: See TracChangeset for help on using the changeset viewer.