Changeset 6869 for 2015


Ignore:
Timestamp:
2015-07-21 14:57:01 (8 years ago)
Author:
oomahutt
Message:
 
Location:
2015/30/OonaH
Files:
28 added
2 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky.cs

    r6852 r6869  
    99public class Aurinkomyrsky : PhysicsGame 
    1010{ 
    11     //const double nopeus = 200; 
    1211    const int RUUDUN_KOKO = 20; 
    1312 
    … …  
    1716    Image tahtiKuva = LoadImage("tahti"); 
    1817    Image avaruus = LoadImage("avaruus"); 
    19     Image aukko = LoadImage("aukko"); 
     18    Image aukkoKuva = LoadImage("aukko2"); 
    2019    Image laatikko = LoadImage("laatikko3"); 
     20    Image myrskynKuva = LoadImage("myrsky2"); 
     21    Image planeettaKuva = LoadImage("Codis"); 
     22    Image lipunKuva = LoadImage("lippu"); 
    2123 
    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); 
     24    Vector nopeusYlos = new Vector(0, 200); 
     25    Vector nopeusVasen = new Vector(-200, 0); 
     26    Vector nopeusOikea = new Vector(200, 0); 
     27    Vector nopeusAlas = new Vector(0,-200); 
    2628 
    2729    SoundEffect maaliAani = LoadSoundEffect("maali"); 
    … …  
    4345        kentta.SetTileMethod('*', LisaaTahti); 
    4446        kentta.SetTileMethod('A', LisaaPelaaja); 
     47        kentta.SetTileMethod('a', LisaaAukko); 
    4548        kentta.Execute(RUUDUN_KOKO, RUUDUN_KOKO); 
    4649        Level.CreateBorders(); 
    … …  
    4952        Level.Background.TextureWrapSize = new Vector(3, 1); 
    5053 
    51         SetWindowSize(1500, 500); 
     54        SetWindowSize(1700, 500); 
     55 
     56        PhysicsObject aurinko = new PhysicsObject(50,500); 
     57        aurinko.Image = myrskynKuva; 
     58        aurinko.X = Level.Left; 
     59        aurinko.Tag = "aurinko"; 
     60        Add(aurinko); 
     61 
     62        PhysicsObject planeetta = new PhysicsObject(100, 500); 
     63        planeetta.Image = planeettaKuva; 
     64        planeetta.X = Level.Right; 
     65        planeetta.Tag = "planeetta"; 
     66        Add(planeetta); 
     67 
     68        PhysicsObject lippu = new PhysicsObject(50, 30); 
     69        lippu.Image = lipunKuva; 
     70        lippu.Tag = "lippu"; 
     71        lippu.X = Level.Right - 75; 
     72        Add(lippu); 
    5273         
    5374    } 
    … …  
    5879        taso.Position = paikka; 
    5980        taso.Image = laatikko; 
    60         taso.Color = Color.DarkBrown; 
    6181        Add(taso); 
    6282    } 
    … …  
    7696        pelaaja1 = new PlatformCharacter(leveys -5, korkeus -5); 
    7797        pelaaja1.Position = paikka; 
    78         pelaaja1.Mass = 4.0; 
    7998        pelaaja1.Image = pelaajanKuva; 
    8099        AddCollisionHandler(pelaaja1, "tahti", TormaaTahteen); 
     100        AddCollisionHandler(pelaaja1, "aurinko", CollisionHandler.ExplodeObject(2000, true)); 
    81101        Add(pelaaja1); 
     102    } 
     103 
     104    void LisaaAukko(Vector paikka, double leveys, double korkeus) 
     105    { 
     106        PhysicsObject aukko = PhysicsObject.CreateStaticObject(leveys, korkeus); 
     107        aukko.IgnoresCollisionResponse = true; 
     108        aukko.Position = paikka; 
     109        aukko.Image = aukkoKuva; 
     110        aukko.Tag = "aukko"; 
     111        Add(aukko); 
    82112    } 
    83113 
    … …  
    104134        tahti.Destroy(); 
    105135    } 
     136 
     137    void Havio(PhysicsObject hahmo, PhysicsObject aurinko) 
     138    { 
     139 
     140         
     141    } 
    106142} 

  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky.csproj.Debug.cachefile

    r6852 r6869  
    11Content\maali.xnb 
    2 Content\norsu.xnb 
    32Content\tahti.xnb 
    43Content\kentta1.xnb 
    54Content\avaruus.xnb 
    65Content\alus.xnb 
    7 Content\aukko.xnb 
    8 Content\laatikko.xnb 
    96Content\laatikko3.xnb 
     7Content\aukko2.xnb 
     8Content\myrsky.xnb 
     9Content\Codis.xnb 
     10Content\lippu.xnb 
     11Content\myrsky2.xnb 

  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky/obj/x86/Debug/Aurinkomyrsky.csproj.FileListAbsolute.txt

    r6852 r6869  
    11C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\maali.xnb 
    2 C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\norsu.xnb 
    32C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\tahti.xnb 
    43C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\kentta1.xnb 
    … …  
    1312C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\avaruus.xnb 
    1413C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\alus.xnb 
    15 C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\aukko.xnb 
    16 C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\laatikko.xnb 
    1714C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\laatikko3.xnb 
     15C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\aukko2.xnb 
     16C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\myrsky.xnb 
     17C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\Codis.xnb 
     18C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\lippu.xnb 
     19C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\myrsky2.xnb 

  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/Aurinkomyrsky/obj/x86/Debug/cachefile-{95D20900-7005-425A-A0CD-AA83EC175105}-targetpath.txt

    r6852 r6869  
    11Content\maali.xnb 
    2 Content\norsu.xnb 
    32Content\tahti.xnb 
    43Content\kentta1.xnb 
    54Content\avaruus.xnb 
    65Content\alus.xnb 
    7 Content\aukko.xnb 
    8 Content\laatikko.xnb 
    96Content\laatikko3.xnb 
     7Content\aukko2.xnb 
     8Content\myrsky.xnb 
     9Content\Codis.xnb 
     10Content\lippu.xnb 
     11Content\myrsky2.xnb 

  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/AurinkomyrskyContent/AurinkomyrskyContent.contentproj

    r6852 r6869  
    5151      <Processor>SoundEffectProcessor</Processor> 
    5252    </Compile> 
    53     <Compile Include="norsu.png"> 
    54       <Name>norsu</Name> 
    55       <Importer>TextureImporter</Importer> 
    56       <Processor>TextureProcessor</Processor> 
    57     </Compile> 
    58     <Compile Include="tahti.png"> 
    59       <Name>tahti</Name> 
    60       <Importer>TextureImporter</Importer> 
    61       <Processor>TextureProcessor</Processor> 
    62     </Compile> 
    6353    <Compile Include="kentta1.txt"> 
    6454      <Name>kentta1</Name> 
    … …  
    8272  </ItemGroup> 
    8373  <ItemGroup> 
    84     <Compile Include="aukko.png"> 
    85       <Name>aukko</Name> 
     74    <Compile Include="laatikko3.png"> 
     75      <Name>laatikko3</Name> 
    8676      <Importer>TextureImporter</Importer> 
    8777      <Processor>TextureProcessor</Processor> 
    … …  
    8979  </ItemGroup> 
    9080  <ItemGroup> 
    91     <Compile Include="laatikko.png"> 
    92       <Name>laatikko</Name> 
     81    <Compile Include="aukko2.png"> 
     82      <Name>aukko2</Name> 
    9383      <Importer>TextureImporter</Importer> 
    9484      <Processor>TextureProcessor</Processor> 
    … …  
    9686  </ItemGroup> 
    9787  <ItemGroup> 
    98     <Compile Include="laatikko3.png"> 
    99       <Name>laatikko3</Name> 
     88    <Compile Include="Codis.png"> 
     89      <Name>Codis</Name> 
     90      <Importer>TextureImporter</Importer> 
     91      <Processor>TextureProcessor</Processor> 
     92    </Compile> 
     93  </ItemGroup> 
     94  <ItemGroup> 
     95    <Compile Include="lippu.png"> 
     96      <Name>lippu</Name> 
     97      <Importer>TextureImporter</Importer> 
     98      <Processor>TextureProcessor</Processor> 
     99    </Compile> 
     100  </ItemGroup> 
     101  <ItemGroup> 
     102    <Compile Include="tahti.png"> 
     103      <Name>tahti</Name> 
     104      <Importer>TextureImporter</Importer> 
     105      <Processor>TextureProcessor</Processor> 
     106    </Compile> 
     107  </ItemGroup> 
     108  <ItemGroup> 
     109    <Compile Include="myrsky.png"> 
     110      <Name>myrsky</Name> 
     111      <Importer>TextureImporter</Importer> 
     112      <Processor>TextureProcessor</Processor> 
     113    </Compile> 
     114  </ItemGroup> 
     115  <ItemGroup> 
     116    <Compile Include="myrsky2.png"> 
     117      <Name>myrsky2</Name> 
    100118      <Importer>TextureImporter</Importer> 
    101119      <Processor>TextureProcessor</Processor> 

  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/AurinkomyrskyContent/kentta1.txt

    r6837 r6869  
    1 ..########################################################################################################### 
    2 ..#.....#....#.......#.....#....###################..........###...........#############..................... 
    3 ..#.#.#.#.#.##.####.####.#...#....#.........#######.########.###.#########.#############.#################### 
    4 ..#.#.#...#.#.....#.#..#.########.#.#.##########.##.########.###.#########.#############.#####.......######## 
    5 ..#.#.#####...###.#.##.#........#...#.........##.##.########......########.#############.#####.#####.######## 
    6 ..#.#...#...###...#..#.#.######.###.#########.##.##.####################...#############.......#####.######## 
    7 ..#.#.#.#######.####.#.#......#.............#.##.##.####################.####....###################.######## 
    8 A.#.#.#.#.....#....###.######.#############.#.##.##.####################....#.#.####################.######## 
    9 ....#.....#.####.###...#....#.#.......#####.#.##.##.#######################.#.#......................######## 
    10 ..#########....#.#...#.#.##.#.#######.#.....#....##.#######################...############################### 
    11 .....#...#######.#.#####..#...#.......#.###########.######################################################### 
    12 ..##.#.#.#...#...#.#...##.#####.#######.#...........######################################################### 
    13 ..#....#...#.#.###.#.#..#.#...#....#....#.################################################################### 
    14 ..#.##.##.######...#.##...#.#.####.#.####.################################################################### 
    15 ..#.#...#........#...####...#......#......################################################################### 
    16 ..########################################################################################################### 
     1....###########################################################################################################................ 
     2...##.....#...*#.......#.....#....#############...a##*.........###..........*#############..................................... 
     3......#.#.#.#.##.####.####.#...#....#........a#.#####.########.###.#########.#...........#.####################................ 
     4...##.#.#...#.#.....#.#a.#.########.#.#.#######.##a##.#......#.###.##...####.#####.#####.#.#####.......########................ 
     5....#.#.#####...###.#.##.#........#...#.........##.##.#.####.#......#.#..###.#.....#....*#.#####.#####.#....###................ 
     6...##.#...#a..###...#..#.#.######.###.#########.##.##.#.#a...########.####...#####.#.#####.......##*##.#.##.###................ 
     7....#.#.#.#######.####.#.#......#*............#.##.##.#.####.#...........#.####....#....a##########.##.#.##.###................ 
     8..A##.#.#.#.....#....###.######.#############.#.##.##.#.#....#.###########....#.#.#################.##.#.##.###................ 
     9.....*#.....#.####.###...#*...#.#a......#####.#.##.##.#.#*####...........####.#.#....#a*****.............##*###................ 
     10...##########...a#.#...#.#.##.#.#######.#.....#....##.#.#......#########....#...####.######################.###................ 
     11.......#...#######.#.#####..#...#.......#.###########.#.######....###########.#......#######................###................ 
     12...###.#.#.#...#...#.#...##.#####.#######.#...........#.#a..###.#####...#...#.######.###.#.#.##################................ 
     13....#....#...#.#a###*#.#..#.#..*#....#....#.#.#########.###...#.#...#.#.#.#.#.#........#.#.#................###................ 
     14...##.##.##.######...#.##...#.#.####.#.####.#.#....####...###.#.#.#.#.#.#.#.#.#.######.#...################.###................ 
     15......#..a#*.......#..*####...#......#......#...##......#.....#...#...#...#...#.....##*..#*.................###................ 
     16...############################################################################################################................ 

  • 2015/30/OonaH/Aurinkomyrsky/Aurinkomyrsky/AurinkomyrskyContent/obj/x86/Debug/ContentPipeline.xml

    r6852 r6869  
    1212    </Item> 
    1313    <Item> 
    14       <Source>norsu.png</Source> 
    15       <Name>norsu</Name> 
    16       <Importer>TextureImporter</Importer> 
    17       <Processor>TextureProcessor</Processor> 
    18       <Options>None</Options> 
    19       <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\norsu.xnb</Output> 
    20       <Time>2015-07-20T14:43:29.8183676+03:00</Time> 
    21     </Item> 
    22     <Item> 
    2314      <Source>tahti.png</Source> 
    2415      <Name>tahti</Name> 
    … …  
    2718      <Options>None</Options> 
    2819      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\tahti.xnb</Output> 
    29       <Time>2015-07-20T14:43:29.8193676+03:00</Time> 
     20      <Time>2015-07-21T14:46:08.3714506+03:00</Time> 
    3021    </Item> 
    3122    <Item> 
    … …  
    3627      <Options>None</Options> 
    3728      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\kentta1.xnb</Output> 
    38       <Time>2015-07-21T11:37:09.208318+03:00</Time> 
     29      <Time>2015-07-21T14:48:37.1526506+03:00</Time> 
    3930    </Item> 
    4031    <Item> 
    … …  
    5748    </Item> 
    5849    <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> 
    7750      <Source>laatikko3.png</Source> 
    7851      <Name>laatikko3</Name> 
    … …  
    8255      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\laatikko3.xnb</Output> 
    8356      <Time>2015-07-21T12:43:36.7726701+03:00</Time> 
     57    </Item> 
     58    <Item> 
     59      <Source>aukko2.png</Source> 
     60      <Name>aukko2</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\aukko2.xnb</Output> 
     65      <Time>2015-07-21T13:32:27.1656064+03:00</Time> 
     66    </Item> 
     67    <Item> 
     68      <Source>myrsky.png</Source> 
     69      <Name>myrsky</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\myrsky.xnb</Output> 
     74      <Time>2015-07-21T14:50:03.3722506+03:00</Time> 
     75    </Item> 
     76    <Item> 
     77      <Source>Codis.png</Source> 
     78      <Name>Codis</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\Codis.xnb</Output> 
     83      <Time>2015-07-21T14:17:41.2832506+03:00</Time> 
     84    </Item> 
     85    <Item> 
     86      <Source>lippu.png</Source> 
     87      <Name>lippu</Name> 
     88      <Importer>TextureImporter</Importer> 
     89      <Processor>TextureProcessor</Processor> 
     90      <Options>None</Options> 
     91      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\lippu.xnb</Output> 
     92      <Time>2015-07-21T14:40:16.9740506+03:00</Time> 
     93    </Item> 
     94    <Item> 
     95      <Source>myrsky2.png</Source> 
     96      <Name>myrsky2</Name> 
     97      <Importer>TextureImporter</Importer> 
     98      <Processor>TextureProcessor</Processor> 
     99      <Options>None</Options> 
     100      <Output>C:\MyTemp\OonaH\Aurinkomyrsky\Aurinkomyrsky\Aurinkomyrsky\bin\x86\Debug\Content\myrsky2.xnb</Output> 
     101      <Time>2015-07-21T14:52:10.0654506+03:00</Time> 
    84102    </Item> 
    85103    <BuildSuccessful>true</BuildSuccessful> 
Note: See TracChangeset for help on using the changeset viewer.