Changeset 8480 for 2017/23


Ignore:
Timestamp:
2017-06-09 13:41:11 (2 years ago)
Author:
nupeohje
Message:

Peli viimestelty

Location:
2017/23/EetuH/tettris2
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • 2017/23/EetuH/tettris2/tettris2/tettris2/obj/x86/Debug/cachefile-{B2C1B154-432F-4B42-9D41-EA3933BD2496}-targetpath.txt

    r8446 r8480  
    11Content\hahmo.xnb 
    22Content\Engine\SystemImage.xnb 
     3Content\ovi.xnb 
    34Content\kentta1.xnb 
    4 Content\ovi.xnb 
  • 2017/23/EetuH/tettris2/tettris2/tettris2/obj/x86/Debug/tettris2.csproj.FileListAbsolute.txt

    r8446 r8480  
    1111C:\Users\Peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2\bin\x86\Debug\Content\kentta1.xnb 
    1212C:\Users\Peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2\bin\x86\Debug\Content\ovi.xnb 
     13C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Content\hahmo.xnb 
     14C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Content\Engine\SystemImage.xnb 
     15C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Content\ovi.xnb 
     16C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Content\kentta1.xnb 
     17C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\tettris2.exe 
     18C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\tettris2.pdb 
     19C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Jypeli.dll 
     20C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Jypeli.xml 
     21C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\obj\x86\Debug\tettris2.csprojResolveAssemblyReference.cache 
     22C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
     23C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\obj\x86\Debug\tettris2.exe 
     24C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\obj\x86\Debug\tettris2.pdb 
  • 2017/23/EetuH/tettris2/tettris2/tettris2/tettris2.cs

    r8446 r8480  
    1919        LuoAikaLaskuri(); 
    2020        AsetaOhjaimet(pallo); 
    21         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli"); 
     21         
    2222        LuoPisteLaskuri(); 
    2323    } 
     
    3333        Add(pallo); 
    3434        AddCollisionHandler(pallo, "ovi", PelaajaTormaaOveen); 
     35        AddCollisionHandler(pallo, "Maali", VoititPelin); 
    3536 
    3637        return pallo; 
     
    103104        Keyboard.Listen(Key.Left, ButtonState.Down, LiikuVasemmalle, "LiikkuuVasemmalle", pallo); 
    104105        Keyboard.Listen(Key.Right, ButtonState.Down, LiikuOikealle, "liikkuuoikealle", pallo); 
    105         Keyboard.Listen(Key.A, ButtonState.Pressed, HeitaKranu, "heittää kranaatin", pallo); 
    106  
     106        Keyboard.Listen(Key.A, ButtonState.Down, HeitaKranu, "heittää kranaatin", pallo); 
     107        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli"); 
    107108    } 
    108109    void Hyppy(PlatformCharacter2 pallo) 
     
    177178        ruudut.SetTileMethod('#', LuoTaso); 
    178179        ruudut.SetTileMethod('P', LuoPelaaja); 
     180        ruudut.SetTileMethod('O', LuoMaali); 
    179181        ruudut.Execute(20, 20); 
    180  
     182        AsetaOhjaimet(pallo); 
     183        Gravity = new Vector(0.0, -500); 
    181184 
    182185    } 
    183186    void LuoPelaaja(Vector paikka, double leveys, double korkeus) 
    184187    { 
    185          
     188        pallo = Luopallo(paikka, leveys, korkeus);    
     189    } 
     190    void LuoMaali(Vector paikka, double leveys, double korkeus) 
     191    { 
     192        PhysicsObject ovi = new PhysicsObject(50.0, 50.0); 
     193        ovi.Position = paikka; 
     194        Add(ovi); 
     195        ovi.MakeStatic(); 
     196        ovi.Color = Color.AshGray; 
     197        ovi.Tag = "Maali"; 
     198        ovi.Image = ovenkuva; 
     199    } 
     200    void VoititPelin(PhysicsObject pallo, PhysicsObject ovi) 
     201    { 
     202        MessageDisplay.Add("Voitit Pelin!!" ); 
     203        Pause(); 
    186204    } 
    187205 
  • 2017/23/EetuH/tettris2/tettris2/tettris2/tettris2.csproj.Debug.cachefile

    r8446 r8480  
    11Content\hahmo.xnb 
    22Content\Engine\SystemImage.xnb 
     3Content\ovi.xnb 
    34Content\kentta1.xnb 
    4 Content\ovi.xnb 
  • 2017/23/EetuH/tettris2/tettris2/tettris2Content/kentta1.txt

    r8446 r8480  
    1 ........................................................... 
    2 ........................................................... 
    3 ........................................................... 
    4 #########.................................................. 
    5 ........................................................... 
    6 ........................................................... 
    7 ........................................................... 
    8 ...........................###############................. 
    9 ...........................########........................ 
    10 ...........................########........................ 
    11 ...........................########........................ 
    12 ...........................########................######## 
    13 ...........................########........................ 
    14 ...........................########........................ 
    15 ...........................########........................ 
    16 ......................#############........................ 
    17 ...........................########........................ 
    18 ...........................########........................ 
    19 ...........................########........................ 
    20 ..P........................########........................ 
    21 ...........................################................ 
    22 #####......................########........................ 
    23 ...........................########........................ 
    24 ...........................########........................ 
    25 ...........................########........................ 
     1.......................................................................................................................................................... 
     2š......................................................................................................................................................... 
     3.......................................................................................................................................................... 
     4.......................................................................................................................................................... 
     5.......................................................................................................................................................... 
     6.......................................................................................................................................................... 
     7.....................################................########################............................................................................. 
     8.....................################................########################............................................................................. 
     9.....................################................########################............................................................................. 
     10.....................################................########################............................................................................. 
     11...............................................................##############............................................................................. 
     12š..............................................................##############............................................................................. 
     13...............................................................##############............................................................................. 
     14...............................................................##############............................................................................. 
     15...............................................................##############............................................................................. 
     16...............................................................##############............................................................................. 
     17...............................................................##################......................................................................... 
     18##################.............................................##############.................................................############################ 
     19...............................................................##############............................................................................. 
     20...............................................................##############............................................................................. 
     21...............................................................##############............................................................................. 
     22š.....................................................P........###################...............###################...................................... 
     23...............................................................##############............................................................................. 
     24...............................................................##############............................................................................. 
     25.............................................################################............................................................................. 
     26...............................................................##############............................................................................. 
     27...............................................................##############.................O........................................................... 
     28...............................................................##############............................................................................. 
     29...............................................................##############............#################################................................ 
     30...............................................................##############............................................................................. 
     31...............................................................##############............................................................................. 
  • 2017/23/EetuH/tettris2/tettris2/tettris2Content/obj/x86/Debug/ContentPipeline.xml

    r8446 r8480  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\tettris2\tettris2\tettris2\bin\x86\Debug\Content\hahmo.xnb</Output> 
     10      <Output>C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Content\hahmo.xnb</Output> 
    1111      <Time>2017-06-07T10:54:22.6259017+03:00</Time> 
    1212    </Item> 
     
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
    19       <Output>C:\Users\Peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2\bin\x86\Debug\Content\Engine\SystemImage.xnb</Output> 
     19      <Output>C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Content\Engine\SystemImage.xnb</Output> 
    2020      <Time>2017-06-06T20:50:32.8039971+03:00</Time> 
     21    </Item> 
     22    <Item> 
     23      <Source>ovi.png</Source> 
     24      <Name>ovi</Name> 
     25      <Importer>TextureImporter</Importer> 
     26      <Processor>TextureProcessor</Processor> 
     27      <Options>None</Options> 
     28      <Output>C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Content\ovi.xnb</Output> 
     29      <Time>2017-06-07T14:55:37.9609444+03:00</Time> 
    2130    </Item> 
    2231    <Item> 
     
    2635      <Processor>TextFileContentProcessor</Processor> 
    2736      <Options>None</Options> 
    28       <Output>C:\Users\Peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2\bin\x86\Debug\Content\kentta1.xnb</Output> 
    29       <Time>2017-06-08T12:50:10.2878577+03:00</Time> 
    30     </Item> 
    31     <Item> 
    32       <Source>ovi.png</Source> 
    33       <Name>ovi</Name> 
    34       <Importer>TextureImporter</Importer> 
    35       <Processor>TextureProcessor</Processor> 
    36       <Options>None</Options> 
    37       <Output>C:\Users\Peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2\bin\x86\Debug\Content\ovi.xnb</Output> 
    38       <Time>2017-06-07T14:55:37.9609444+03:00</Time> 
     37      <Output>C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Content\kentta1.xnb</Output> 
     38      <Time>2017-06-09T12:57:52.4647812+03:00</Time> 
    3939    </Item> 
    4040    <BuildSuccessful>true</BuildSuccessful> 
     
    4444      <BuildConfiguration>Debug</BuildConfiguration> 
    4545      <CompressContent>false</CompressContent> 
    46       <RootDirectory>C:\Users\Peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2Content\</RootDirectory> 
    47       <LoggerRootDirectory>C:\Users\Peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2\</LoggerRootDirectory> 
    48       <IntermediateDirectory>C:\Users\Peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2Content\obj\x86\Debug\</IntermediateDirectory> 
    49       <OutputDirectory>C:\Users\Peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2\bin\x86\Debug\Content\</OutputDirectory> 
     46      <RootDirectory>C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2Content\</RootDirectory> 
     47      <LoggerRootDirectory>C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\</LoggerRootDirectory> 
     48      <IntermediateDirectory>C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2Content\obj\x86\Debug\</IntermediateDirectory> 
     49      <OutputDirectory>C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2\bin\x86\Debug\Content\</OutputDirectory> 
    5050    </Settings> 
    5151    <Assemblies> 
  • 2017/23/EetuH/tettris2/tettris2/tettris2Content/obj/x86/Debug/tettris2Content.contentproj.FileListAbsolute.txt

    r8446 r8480  
    11c:\users\peliohjelmointi\documents\visual studio 2013\Projects\tettris2\tettris2\tettris2Content\obj\x86\Debug\tettris2Content.contentprojResolveAssemblyReference.cache 
     2C:\Users\Peliohjelmointi\Documents\EetuH\tettris2\tettris2\tettris2Content\obj\x86\Debug\tettris2Content.contentprojResolveAssemblyReference.cache 
Note: See TracChangeset for help on using the changeset viewer.