Changeset 6837 for 2015


Ignore:
Timestamp:
2015-07-21 11:54:52 (4 years ago)
Author:
oomahutt
Message:
 
Location:
2015/30/OonaH
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky.cs

    r6829 r6837  
    99public class Aurinkomyrsky : PhysicsGame 
    1010{ 
    11     const double nopeus = 200; 
    12     const int RUUDUN_KOKO = 40; 
     11    //const double nopeus = 200; 
     12    const int RUUDUN_KOKO = 20; 
    1313 
    1414    PlatformCharacter pelaaja1; 
     
    1717    Image tahtiKuva = LoadImage("tahti"); 
    1818    Image avaruus = LoadImage("avaruus"); 
     19    Image aukko = LoadImage("aukko"); 
     20    Image laatikko = LoadImage("laatikko2"); 
    1921 
    20     Vector nopeusYlos = new Vector(0, 300); 
    21     Vector nopeusVasen = new Vector(-300, 0); 
    22     Vector nopeusOikea = new Vector(300, 0); 
    23     Vector nopeusAlas = new Vector(-300, 0); 
     22    Vector nopeusYlos = new Vector(0, 100); 
     23    Vector nopeusVasen = new Vector(-100, 0); 
     24    Vector nopeusOikea = new Vector(100, 0); 
     25    Vector nopeusAlas = new Vector(0,-100); 
    2426 
    2527    SoundEffect maaliAani = LoadSoundEffect("maali"); 
     
    4446        Level.CreateBorders(); 
    4547        Level.Background.Image = avaruus; 
     48        Level.Background.FitToLevel(); 
     49        Level.Background.TextureWrapSize = new Vector(3, 1); 
     50 
     51        SetWindowSize(1500, 500); 
     52         
    4653    } 
    4754 
     
    5057        PhysicsObject taso = PhysicsObject.CreateStaticObject(leveys, korkeus); 
    5158        taso.Position = paikka; 
    52         taso.Color = Color.Brown; 
     59        taso.Image = laatikko; 
     60        taso.Color = Color.DarkBrown; 
    5361        Add(taso); 
    5462    } 
     
    6674    void LisaaPelaaja(Vector paikka, double leveys, double korkeus) 
    6775    { 
    68         pelaaja1 = new PlatformCharacter(leveys, korkeus); 
     76        pelaaja1 = new PlatformCharacter(leveys -5, korkeus -5); 
    6977        pelaaja1.Position = paikka; 
    7078        pelaaja1.Mass = 4.0; 
    7179        pelaaja1.Image = pelaajanKuva; 
    72         pelaaja1.Push(new Vector(100,0)); 
    73         pelaaja1.LinearDamping = 0.95; 
    7480        AddCollisionHandler(pelaaja1, "tahti", TormaaTahteen); 
    7581        Add(pelaaja1); 
     
    8793    } 
    8894 
    89     void Liikuta(PlatformCharacter hahmo, double nopeus) 
    90     { 
    91         //hahmo.Walk(nopeus); 
    92     } 
    93  
    9495    void AsetaNopeus(PhysicsObject alus, Vector nopeus) 
    9596    { 
    96         if ((nopeus.Y > 0) && (alus.Top > Level.Top)) 
    97         { 
    98             alus.Velocity = Vector.Zero; 
    99             return; 
    100         } 
    101  
    102         if ((nopeus.Y < 0) && (alus.Bottom < Level.Bottom)) 
    103         { 
    104             alus.Velocity = Vector.Zero; 
    105             return; 
    106         } 
    10797        alus.Velocity = nopeus; 
    10898    } 
  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky.csproj.Debug.cachefile

    r6829 r6837  
    55Content\avaruus.xnb 
    66Content\alus.xnb 
     7Content\aukko.xnb 
     8Content\laatikko.xnb 
     9Content\laatikko2.xnb 
  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky/obj/x86/Debug/Aurinkomyrsky.csproj.FileListAbsolute.txt

    r6829 r6837  
    1313C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\avaruus.xnb 
    1414C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\alus.xnb 
     15C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\aukko.xnb 
     16C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\laatikko.xnb 
     17C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\laatikko2.xnb 
  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky/obj/x86/Debug/cachefile-{95D20900-7005-425A-A0CD-AA83EC175105}-targetpath.txt

    r6829 r6837  
    55Content\avaruus.xnb 
    66Content\alus.xnb 
     7Content\aukko.xnb 
     8Content\laatikko.xnb 
     9Content\laatikko2.xnb 
  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/AurinkomyrskyContent/AurinkomyrskyContent.contentproj

    r6829 r6837  
    8181    </Compile> 
    8282  </ItemGroup> 
     83  <ItemGroup> 
     84    <Compile Include="aukko.png"> 
     85      <Name>aukko</Name> 
     86      <Importer>TextureImporter</Importer> 
     87      <Processor>TextureProcessor</Processor> 
     88    </Compile> 
     89  </ItemGroup> 
     90  <ItemGroup> 
     91    <Compile Include="laatikko.png"> 
     92      <Name>laatikko</Name> 
     93      <Importer>TextureImporter</Importer> 
     94      <Processor>TextureProcessor</Processor> 
     95    </Compile> 
     96  </ItemGroup> 
     97  <ItemGroup> 
     98    <Compile Include="laatikko2.png"> 
     99      <Name>laatikko2</Name> 
     100      <Importer>TextureImporter</Importer> 
     101      <Processor>TextureProcessor</Processor> 
     102    </Compile> 
     103  </ItemGroup> 
    83104  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    84105  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/AurinkomyrskyContent/kentta1.txt

    r6829 r6837  
    1  
    2  
    3  
    4  
    5  
    6  
    7  
    8 A 
    9  
    10  
    11  
    12  
    13 #  # # 
    14 ### 
    15 #                                                    
    16 ######################################## 
     1..########################################################################################################### 
     2..#.....#....#.......#.....#....###################..........###...........#############..................... 
     3..#.#.#.#.#.##.####.####.#...#....#.........#######.########.###.#########.#############.#################### 
     4..#.#.#...#.#.....#.#..#.########.#.#.##########.##.########.###.#########.#############.#####.......######## 
     5..#.#.#####...###.#.##.#........#...#.........##.##.########......########.#############.#####.#####.######## 
     6..#.#...#...###...#..#.#.######.###.#########.##.##.####################...#############.......#####.######## 
     7..#.#.#.#######.####.#.#......#.............#.##.##.####################.####....###################.######## 
     8A.#.#.#.#.....#....###.######.#############.#.##.##.####################....#.#.####################.######## 
     9....#.....#.####.###...#....#.#.......#####.#.##.##.#######################.#.#......................######## 
     10..#########....#.#...#.#.##.#.#######.#.....#....##.#######################...############################### 
     11.....#...#######.#.#####..#...#.......#.###########.######################################################### 
     12..##.#.#.#...#...#.#...##.#####.#######.#...........######################################################### 
     13..#....#...#.#.###.#.#..#.#...#....#....#.################################################################### 
     14..#.##.##.######...#.##...#.#.####.#.####.################################################################### 
     15..#.#...#........#...####...#......#......################################################################### 
     16..########################################################################################################### 
  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/AurinkomyrskyContent/obj/x86/Debug/ContentPipeline.xml

    r6829 r6837  
    3636      <Options>None</Options> 
    3737      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\kentta1.xnb</Output> 
    38       <Time>2015-07-21T10:13:05.7090067+03:00</Time> 
     38      <Time>2015-07-21T11:37:09.208318+03:00</Time> 
    3939    </Item> 
    4040    <Item> 
     
    5555      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\alus.xnb</Output> 
    5656      <Time>2015-07-21T09:54:29.324499+03:00</Time> 
     57    </Item> 
     58    <Item> 
     59      <Source>aukko.png</Source> 
     60      <Name>aukko</Name> 
     61      <Importer>TextureImporter</Importer> 
     62      <Processor>TextureProcessor</Processor> 
     63      <Options>None</Options> 
     64      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\aukko.xnb</Output> 
     65      <Time>2015-07-21T11:17:17.5016164+03:00</Time> 
     66    </Item> 
     67    <Item> 
     68      <Source>laatikko.png</Source> 
     69      <Name>laatikko</Name> 
     70      <Importer>TextureImporter</Importer> 
     71      <Processor>TextureProcessor</Processor> 
     72      <Options>None</Options> 
     73      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\laatikko.xnb</Output> 
     74      <Time>2015-07-21T11:48:32.021118+03:00</Time> 
     75    </Item> 
     76    <Item> 
     77      <Source>laatikko2.png</Source> 
     78      <Name>laatikko2</Name> 
     79      <Importer>TextureImporter</Importer> 
     80      <Processor>TextureProcessor</Processor> 
     81      <Options>None</Options> 
     82      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\laatikko2.xnb</Output> 
     83      <Time>2015-07-21T11:53:36.993718+03:00</Time> 
    5784    </Item> 
    5885    <BuildSuccessful>true</BuildSuccessful> 
  • 2015/30/OonaH/PingPong/PingPong/PingPongContent/PingPongContent.contentproj

    r6815 r6837  
    5050      <Importer>FontDescriptionImporter</Importer> 
    5151      <Processor>FontDescriptionProcessor</Processor> 
     52      <SubType>Designer</SubType> 
    5253    </Compile> 
    5354  </ItemGroup> 
Note: See TracChangeset for help on using the changeset viewer.