Changeset 8672 for 2017/24


Ignore:
Timestamp:
2017-06-14 15:01:37 (2 years ago)
Author:
npo17_8
Message:

lisäsin esineitä jeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeessssssssssssssssssssss!!!!!!!!!!!!!!!!!!!!!!!!!!

Location:
2017/24/AaroM/Asteroids
Files:
4 added
11 edited

Legend:

Unmodified
Added
Removed
  • 2017/24/AaroM/Asteroids/Asteroids/Asteroids/Asteroids.cs

    r8655 r8672  
    1616        Level.Height = Screen.Height; 
    1717        asteroidi(345.0, -98.0); 
    18         asteroidi(-250.0, 100.0); 
     18        asteroidi(-450.0, 100.0); 
    1919        Pieniasteroidi(-165, -234); 
    20         Pieniasteroidi(145, 234); 
    21         Spaceship1(); 
    22         Spaceship2(); 
     20        Pieniasteroidi(445, 234); 
     21        Spaceship1(-150.0, 0.0); 
     22        Spaceship2(150.0, 0.0); 
    2323        Liikkumiskomennot(); 
    2424        Ufo(450, -450); 
    25  
     25        Ufo(-450, 450); 
     26        aurinko(); 
     27        maapallo(); 
    2628 
    2729 
     
    4446    } 
    4547 
     48    void aurinko() 
     49    { 
     50        PhysicsObject aurinko = PhysicsObject.CreateStaticObject (200.0, 200.0, Shape.Circle); 
     51        aurinko.X = 870; 
     52        aurinko.Y = 500; 
     53        aurinko.Image = LoadImage("aurinko"); 
     54        Add(aurinko); 
     55    } 
     56 
     57 
     58 
     59 
    4660    void asteroidi(double X, double Y) 
    4761    { 
    4862        PhysicsObject asteroidi = new PhysicsObject(260.0, 200.0, Shape.Circle); 
     63        Vector impulssi = new Vector(200.0, 0.0); 
     64        asteroidi.Hit(impulssi); 
    4965        asteroidi.Image = LoadImage("joo"); 
    5066        asteroidi.X = X; 
     
    5268        Add(asteroidi); 
    5369    } 
     70 
     71    void maapallo() 
     72    { 
     73        PhysicsObject maapallo = PhysicsObject.CreateStaticObject(100.0, 100.0, Shape.Circle); 
     74        maapallo.Image = LoadImage("nonii maapallo"); 
     75        Add(maapallo); 
     76    } 
     77 
     78 
    5479 
    5580    void Pieniasteroidi(double X, double Y) 
     
    7499 
    75100 
    76     void Spaceship1() 
     101    void Spaceship1(double X, double Y) 
    77102    { 
    78103        spaceship1 = new PhysicsObject(50.0, 50.0); 
    79104        spaceship1.Image = LoadImage("#spaceship"); 
     105        spaceship1.X = X; 
     106        spaceship1.Y = Y; 
    80107        Add(spaceship1); 
    81108    } 
    82109 
    83     void Spaceship2() 
     110    void Spaceship2(double X, double Y) 
    84111    { 
    85112        spaceship2 = new PhysicsObject(50.0, 50.0); 
    86         spaceship2.X = 100; 
    87         spaceship2.Y = 0; 
     113        spaceship2.X = X; 
     114        spaceship2.Y = X; 
    88115        spaceship2.Image = LoadImage("spaceship 2t"); 
    89116        Add(spaceship2); 
     
    111138     } 
    112139 
    113  
    114140} 
  • 2017/24/AaroM/Asteroids/Asteroids/Asteroids/Asteroids.csproj.Debug.cachefile

    r8655 r8672  
    55Content\miniasteroid.xnb 
    66Content\munufo.xnb 
     7Content\aurinko.xnb 
     8Content\nonii maapallo.xnb 
  • 2017/24/AaroM/Asteroids/Asteroids/Asteroids/obj/x86/Debug/Asteroids.csproj.FileListAbsolute.txt

    r8655 r8672  
    1313C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\miniasteroid.xnb 
    1414C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\munufo.xnb 
     15C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\aurinko.xnb 
     16C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\nonii maapallo.xnb 
  • 2017/24/AaroM/Asteroids/Asteroids/Asteroids/obj/x86/Debug/ContentPipeline-{093C8DB8-B433-4224-8809-5BA07E2A4E45}.xml

    r8655 r8672  
    5656      <Time>2017-06-14T13:00:58.7195683+03:00</Time> 
    5757    </Item> 
     58    <Item> 
     59      <Source>aurinko .png</Source> 
     60      <Name>aurinko</Name> 
     61      <Importer>TextureImporter</Importer> 
     62      <Processor>TextureProcessor</Processor> 
     63      <Options>None</Options> 
     64      <Output>C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\aurinko.xnb</Output> 
     65      <Time>2017-06-14T14:19:02.7774475+03:00</Time> 
     66    </Item> 
     67    <Item> 
     68      <Source>nonii maapallo.png</Source> 
     69      <Name>nonii maapallo</Name> 
     70      <Importer>TextureImporter</Importer> 
     71      <Processor>TextureProcessor</Processor> 
     72      <Options>None</Options> 
     73      <Output>C:\MyTemp\AaroM\Asteroids\Asteroids\Asteroids\bin\x86\Debug\Content\nonii maapallo.xnb</Output> 
     74      <Time>2017-06-14T14:55:23.7986028+03:00</Time> 
     75    </Item> 
    5876    <BuildSuccessful>true</BuildSuccessful> 
    5977    <Settings> 
  • 2017/24/AaroM/Asteroids/Asteroids/Asteroids/obj/x86/Debug/cachefile-{093C8DB8-B433-4224-8809-5BA07E2A4E45}-targetpath.txt

    r8655 r8672  
    55Content\miniasteroid.xnb 
    66Content\munufo.xnb 
     7Content\aurinko.xnb 
     8Content\nonii maapallo.xnb 
  • 2017/24/AaroM/Asteroids/Asteroids/AsteroidsContent/AsteroidsContent.contentproj

    r8655 r8672  
    8787    </Compile> 
    8888  </ItemGroup> 
     89  <ItemGroup> 
     90    <Compile Include="aurinko .png"> 
     91      <Name>aurinko</Name> 
     92      <Importer>TextureImporter</Importer> 
     93      <Processor>TextureProcessor</Processor> 
     94    </Compile> 
     95  </ItemGroup> 
     96  <ItemGroup> 
     97    <Compile Include="nonii maapallo.png"> 
     98      <Name>nonii maapallo</Name> 
     99      <Importer>TextureImporter</Importer> 
     100      <Processor>TextureProcessor</Processor> 
     101    </Compile> 
     102  </ItemGroup> 
    89103  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    90104  <!--  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.