Changeset 9482 for 2017/24


Ignore:
Timestamp:
2017-11-18 15:00:37 (20 months ago)
Author:
rikavila
Message:
 
Location:
2017/24/EljaL/TheMetsäsurvivor
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • 2017/24/EljaL/TheMetsäsurvivor/TheMetsäsurvivor/TheMetsäsurvivor/TheMetsäsurvivor.cs

    r9465 r9482  
    3535        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli"); 
    3636 
     37        ControllerOne.Listen(Button.Start, ButtonState.Pressed, Pause, "pysäyttää pelin"); 
     38 
     39        ControllerOne.Listen(Button.A, ButtonState.Down, luokansa, null); 
     40 
     41        ControllerOne.Listen(Button.Back, ButtonState.Pressed, ConfirmExit, "lopeta peli"); 
     42 
     43        Keyboard.Listen(Key.M, ButtonState.Pressed, zoom, null); 
     44        Keyboard.Listen(Key.N, ButtonState.Pressed, zoomi, null); 
     45 
    3746        IsFullScreen = false; 
    3847 
     
    4857        Mouse.IsCursorVisible = true; 
    4958 
    50         Camera.Zoom(1.0); 
    5159 
    5260        Reuna(10, 4000, -2000, 0); 
     
    9199        Keyboard.Listen(Key.W, ButtonState.Down, LiikutaPelaajaa, null, new Vector(0, 50)); 
    92100        Keyboard.Listen(Key.S, ButtonState.Down, LiikutaPelaajaa, null, new Vector(0, -50)); 
     101 
     102        ControllerOne.Listen(Button.DPadLeft, ButtonState.Down, LiikutaPelaajaa, null, new Vector(-50, 0)); 
     103        ControllerOne.Listen(Button.DPadRight, ButtonState.Down, LiikutaPelaajaa, null, new Vector(50, 0)); 
     104        ControllerOne.Listen(Button.DPadUp, ButtonState.Down, LiikutaPelaajaa, null, new Vector(0, 50)); 
     105        ControllerOne.Listen(Button.DPadDown, ButtonState.Down, LiikutaPelaajaa, null, new Vector(0, -50)); 
     106 
     107        ControllerOne.Listen(Button.DPadLeft, ButtonState.Down, käännäpelaajaav, null); 
     108        ControllerOne.Listen(Button.DPadRight, ButtonState.Down, käännäpelaajaao, null); 
     109        ControllerOne.Listen(Button.DPadUp, ButtonState.Down, käännäpelaajaay, null); 
     110        ControllerOne.Listen(Button.DPadDown, ButtonState.Down, käännäpelaajaaa, null); 
    93111 
    94112        Camera.Follow(ihminen); 
     
    284302        pistegennaytto.Title = "pistegeneraattorit"; 
    285303        Keyboard.Listen(Key.I, ButtonState.Pressed, pistegeneraattori, null); 
     304        ControllerOne.Listen(Button.Y, ButtonState.Pressed, pistegeneraattori, null); 
    286305 
    287306        pistegennaytto.BindTo(pistegen); 
     
    328347        puugennaytto.Title = "puugeneraattorit"; 
    329348        Keyboard.Listen(Key.P, ButtonState.Pressed, puugeneraattori, null); 
     349        ControllerOne.Listen(Button.B, ButtonState.Pressed, puugeneraattori, null); 
    330350 
    331351        puugennaytto.BindTo(puugen); 
     
    347367        kivigennaytto.Title = "kivigeneraattorit"; 
    348368        Keyboard.Listen(Key.K, ButtonState.Pressed, kivigenraattori, null); 
     369        ControllerOne.Listen(Button.X, ButtonState.Pressed, kivigenraattori, null); 
    349370 
    350371        kivigennaytto.BindTo(kivigen); 
     
    475496        AddCollisionHandler(ihminen, karhu, karhutormays); 
    476497    } 
     498    void zoom () 
     499    { 
     500        Camera.Follow(ihminen); 
     501        Camera.Zoom(1.0); 
     502    } 
     503    void zoomi () 
     504    { 
     505        Camera.ZoomToLevel(); 
     506        Camera.ZoomFactor = 0.3; 
     507    } 
    477508} 
  • 2017/24/EljaL/TheMetsäsurvivor/TheMetsäsurvivor/TheMetsäsurvivor/TheMetsäsurvivor.csproj.Debug.cachefile

    r9465 r9482  
    33Content\Puu.xnb 
    44Content\kivi.xnb 
     5Content\karhu2.xnb 
     6Content\Gene.xnb 
     7Content\TNT.xnb 
    58Content\karhuaani.xnb 
    69Content\musiikki.xnb 
    710Content\loppumusa.xnb 
    8 Content\karhu2.xnb 
    9 Content\Gene.xnb 
    10 Content\TNT.xnb 
  • 2017/24/EljaL/TheMetsäsurvivor/TheMetsäsurvivor/TheMetsäsurvivor/obj/x86/Debug/ContentPipeline-{3FE3A1DE-8588-4F92-B05A-56882A8DB65B}.xml

    r9465 r9482  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\ihminen.xnb</Output> 
    11       <Time>2017-10-21T10:31:52.0576026+03:00</Time> 
     10      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\ihminen.xnb</Output> 
     11      <Time>2017-11-18T14:01:06.0852873+02:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
    19       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\karhu.xnb</Output> 
    20       <Time>2017-10-21T10:31:52.3857716+03:00</Time> 
     19      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\karhu.xnb</Output> 
     20      <Time>2017-11-18T14:01:06.3352856+02:00</Time> 
    2121    </Item> 
    2222    <Item> 
     
    2626      <Processor>TextureProcessor</Processor> 
    2727      <Options>None</Options> 
    28       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\Puu.xnb</Output> 
    29       <Time>2017-10-21T10:31:52.3857716+03:00</Time> 
     28      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\Puu.xnb</Output> 
     29      <Time>2017-11-18T14:01:06.3352856+02:00</Time> 
    3030    </Item> 
    3131    <Item> 
     
    3535      <Processor>TextureProcessor</Processor> 
    3636      <Options>None</Options> 
    37       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\kivi.xnb</Output> 
    38       <Time>2017-10-21T10:31:51.9349188+03:00</Time> 
     37      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\kivi.xnb</Output> 
     38      <Time>2017-11-18T14:01:05.960287+02:00</Time> 
     39    </Item> 
     40    <Item> 
     41      <Source>karhu2.png</Source> 
     42      <Name>karhu2</Name> 
     43      <Importer>TextureImporter</Importer> 
     44      <Processor>TextureProcessor</Processor> 
     45      <Options>None</Options> 
     46      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\karhu2.xnb</Output> 
     47      <Time>2017-11-18T14:01:05.9134077+02:00</Time> 
     48    </Item> 
     49    <Item> 
     50      <Source>Gene.png</Source> 
     51      <Name>Gene</Name> 
     52      <Importer>TextureImporter</Importer> 
     53      <Processor>TextureProcessor</Processor> 
     54      <Options>None</Options> 
     55      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\Gene.xnb</Output> 
     56      <Time>2017-11-18T14:01:05.9290325+02:00</Time> 
     57    </Item> 
     58    <Item> 
     59      <Source>TNT.png</Source> 
     60      <Name>TNT</Name> 
     61      <Importer>TextureImporter</Importer> 
     62      <Processor>TextureProcessor</Processor> 
     63      <Options>None</Options> 
     64      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\TNT.xnb</Output> 
     65      <Time>2017-11-18T14:01:05.9759101+02:00</Time> 
    3966    </Item> 
    4067    <Item> 
     
    4471      <Processor>SoundEffectProcessor</Processor> 
    4572      <Options>None</Options> 
    46       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\karhuaani.xnb</Output> 
    47       <Time>2017-10-21T10:31:51.9036652+03:00</Time> 
     73      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\karhuaani.xnb</Output> 
     74      <Time>2017-11-18T14:01:05.9290325+02:00</Time> 
    4875    </Item> 
    4976    <Item> 
     
    5380      <Processor>SoundEffectProcessor</Processor> 
    5481      <Options>None</Options> 
    55       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\musiikki.xnb</Output> 
    56       <Time>2017-10-21T10:31:51.9192936+03:00</Time> 
     82      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\musiikki.xnb</Output> 
     83      <Time>2017-11-18T14:01:05.960287+02:00</Time> 
    5784    </Item> 
    5885    <Item> 
     
    6289      <Processor>SoundEffectProcessor</Processor> 
    6390      <Options>None</Options> 
    64       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\loppumusa.xnb</Output> 
    65       <Time>2017-10-21T10:31:51.9192936+03:00</Time> 
    66     </Item> 
    67     <Item> 
    68       <Source>karhu2.png</Source> 
    69       <Name>karhu2</Name> 
    70       <Importer>TextureImporter</Importer> 
    71       <Processor>TextureProcessor</Processor> 
    72       <Options>None</Options> 
    73       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\karhu2.xnb</Output> 
    74       <Time>2017-10-21T13:01:59.3889029+03:00</Time> 
    75     </Item> 
    76     <Item> 
    77       <Source>Gene.png</Source> 
    78       <Name>Gene</Name> 
    79       <Importer>TextureImporter</Importer> 
    80       <Processor>TextureProcessor</Processor> 
    81       <Options>None</Options> 
    82       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\Gene.xnb</Output> 
    83       <Time>2017-10-21T14:43:59.4443352+03:00</Time> 
    84     </Item> 
    85     <Item> 
    86       <Source>TNT.png</Source> 
    87       <Name>TNT</Name> 
    88       <Importer>TextureImporter</Importer> 
    89       <Processor>TextureProcessor</Processor> 
    90       <Options>None</Options> 
    91       <Output>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\TNT.xnb</Output> 
    92       <Time>2017-10-21T14:48:11.6906482+03:00</Time> 
     91      <Output>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\loppumusa.xnb</Output> 
     92      <Time>2017-11-18T14:01:05.9446586+02:00</Time> 
    9393    </Item> 
    9494    <BuildSuccessful>true</BuildSuccessful> 
     
    9999      <BuildConfiguration>Debug</BuildConfiguration> 
    100100      <CompressContent>false</CompressContent> 
    101       <RootDirectory>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivorContent\</RootDirectory> 
    102       <LoggerRootDirectory>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\</LoggerRootDirectory> 
    103       <IntermediateDirectory>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\obj\x86\Debug\</IntermediateDirectory> 
    104       <OutputDirectory>C:\MyTemp\EljaL\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\</OutputDirectory> 
     101      <RootDirectory>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivorContent\</RootDirectory> 
     102      <LoggerRootDirectory>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\</LoggerRootDirectory> 
     103      <IntermediateDirectory>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\obj\x86\Debug\</IntermediateDirectory> 
     104      <OutputDirectory>C:\MyTemp\EljaL\TheMetsäsurvivor\TheMetsäsurvivor\TheMetsäsurvivor\bin\x86\Debug\Content\</OutputDirectory> 
    105105    </Settings> 
    106106    <Assemblies> 
     
    139139      <Assembly> 
    140140        <Key>C:\WINDOWS\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
    141         <Value>2017-06-22T06:38:30.2204564+03:00</Value> 
     141        <Value>2017-06-07T09:42:02.3620639+03:00</Value> 
    142142      </Assembly> 
    143143    </Assemblies> 
  • 2017/24/EljaL/TheMetsäsurvivor/TheMetsäsurvivor/TheMetsäsurvivor/obj/x86/Debug/TheMetsäsurvivor.csproj.FileListAbsolute.txt

    r9465 r9482  
    3232C:\MyTemp\EljaL\EljaL\TheMetsÀsurvivor\TheMetsÀsurvivor\TheMetsÀsurvivor\bin\x86\Debug\Content\Gene.xnb 
    3333C:\MyTemp\EljaL\EljaL\TheMetsÀsurvivor\TheMetsÀsurvivor\TheMetsÀsurvivor\bin\x86\Debug\Content\TNT.xnb 
     34C:\MyTemp\EljaL\TheMetsÀsurvivor\TheMetsÀsurvivor\TheMetsÀsurvivor\bin\x86\Debug\Content\karhu2.xnb 
     35C:\MyTemp\EljaL\TheMetsÀsurvivor\TheMetsÀsurvivor\TheMetsÀsurvivor\bin\x86\Debug\Content\Gene.xnb 
     36C:\MyTemp\EljaL\TheMetsÀsurvivor\TheMetsÀsurvivor\TheMetsÀsurvivor\bin\x86\Debug\Content\TNT.xnb 
  • 2017/24/EljaL/TheMetsäsurvivor/TheMetsäsurvivor/TheMetsäsurvivor/obj/x86/Debug/cachefile-{3FE3A1DE-8588-4F92-B05A-56882A8DB65B}-targetpath.txt

    r9465 r9482  
    33Content\Puu.xnb 
    44Content\kivi.xnb 
     5Content\karhu2.xnb 
     6Content\Gene.xnb 
     7Content\TNT.xnb 
    58Content\karhuaani.xnb 
    69Content\musiikki.xnb 
    710Content\loppumusa.xnb 
    8 Content\karhu2.xnb 
    9 Content\Gene.xnb 
    10 Content\TNT.xnb 
Note: See TracChangeset for help on using the changeset viewer.