Changeset 5770 for 2014


Ignore:
Timestamp:
2014-11-15 14:55:34 (5 years ago)
Author:
sieerinn
Message:
 
Location:
2014/koodauskerho/38/OttoR/Z_Game
Files:
1 added
16 edited

Legend:

Unmodified
Added
Removed
  • 2014/koodauskerho/38/OttoR/Z_Game/Z_Game/Z_Game/Z_Game.cs

    r5761 r5770  
    105105    { 
    106106        pelaajan1Ase = new AssaultRifle(40, 35); 
    107  
    108  
    109         pelaaja1.Add(pelaajan1Ase); 
    110  
     107        pelaajan1Ase.FireRate = 99999; 
     108 
     109        pelaajan1Ase.Ammo.Value = 3; 
     110        pelaajan1Ase.InfiniteAmmo = false; 
     111        pelaajan1Ase.  ProjectileCollision = AmmusOsui; 
     112 
     113         
     114        pelaaja1.Weapon = pelaajan1Ase; 
     115        pelaaja1.Weapon.Image = null; 
     116        pelaaja1.Weapon.Color = Color.Transparent; 
     117 
     118        Timer ajastin = new Timer(); 
     119        ajastin.Interval = 0.5; 
     120        ajastin.Timeout += delegate 
     121        { 
     122            pelaajan1Ase.Ammo.Value = 3; 
     123        }; 
     124        ajastin.Start(); 
     125    } 
     126 
     127    void AmmusOsui(PhysicsObject ammus, PhysicsObject kohde) 
     128    { 
     129        ammus.Destroy(); 
    111130    } 
    112131 
     
    140159    void AmmuAseella(AssaultRifle ase) 
    141160    { 
     161        Timer.SingleShot(0.01, delegate { ammuaseellakulma(ase, Angle.FromDegrees(5.0)); }); 
     162        Timer.SingleShot(0.03, delegate { ammuaseellakulma(ase, Angle.FromDegrees(0.0)); }); 
     163        Timer.SingleShot(0.06, delegate { ammuaseellakulma(ase, Angle.FromDegrees(-5.0)); });         
     164         
     165    } 
     166 
     167    void ammuaseellakulma(AssaultRifle ase, Angle kulma) 
     168    { 
     169        //ase.Angle = kulma; 
     170 
     171        ase.AbsoluteAngle = pelaaja1.FacingDirection.Angle + kulma; 
    142172        PhysicsObject ammus = ase.Shoot(); 
     173       
     174        //ase.Angle = Angle.FromDegrees(0.0); 
     175 
    143176 
    144177        if (ammus != null) 
    145178        { 
    146179            ammus.Size *= 1; 
    147             //ammus.Image = ... 
    148             ammus.MaximumLifetime = TimeSpan.FromSeconds(10.0); 
     180            //ammus.Image =  
     181            ammus.MaximumLifetime = TimeSpan.FromSeconds(5.0); 
     182             
    149183        } 
    150     } 
    151  
    152      
     184        //return ammus; 
     185    } 
    153186 
    154187 
     
    162195        Keyboard.Listen(Key.W, ButtonState.Pressed, Hyppaa, "Pelaaja hyppää", pelaaja1, hyppyNopeus); 
    163196 
    164         Keyboard.Listen(Key.Space, ButtonState.Down, AmmuAseella, "Ammu", pelaajan1Ase); 
     197        Keyboard.Listen(Key.Space, ButtonState.Pressed, AmmuAseella, "Ammu", pelaajan1Ase); 
    165198 
    166199 
  • 2014/koodauskerho/38/OttoR/Z_Game/Z_Game/Z_Game/Z_Game.csproj.Debug.cachefile

    r5737 r5770  
    22Content\norsu.xnb 
    33Content\tahti.xnb 
    4 Content\kentta1.xnb 
     4Content\maa.xnb 
    55Content\ruoho.xnb 
    6 Content\maa.xnb 
    76Content\Player3.xnb 
    87Content\Player3juoksu1.xnb 
    98Content\Player3juoksu2.xnb 
     9Content\kentta1.xnb 
  • 2014/koodauskerho/38/OttoR/Z_Game/Z_Game/Z_Game/obj/x86/Debug/ContentPipeline-{ABA5B0B1-2E94-4679-923C-981499C2D96C}.xml

    r5761 r5770  
    88      <Processor>SoundEffectProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\maali.xnb</Output> 
    11       <Time>2014-09-20T11:54:14.539772+03:00</Time> 
     10      <Output>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\maali.xnb</Output> 
     11      <Time>2014-11-15T10:23:41.9302511+02:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
    19       <Output>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\norsu.xnb</Output> 
    20       <Time>2014-09-20T11:54:14.5407721+03:00</Time> 
     19      <Output>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\norsu.xnb</Output> 
     20      <Time>2014-11-15T10:23:42.0082511+02:00</Time> 
    2121    </Item> 
    2222    <Item> 
     
    2626      <Processor>TextureProcessor</Processor> 
    2727      <Options>None</Options> 
    28       <Output>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\tahti.xnb</Output> 
    29       <Time>2014-09-20T11:54:14.5417722+03:00</Time> 
     28      <Output>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\tahti.xnb</Output> 
     29      <Time>2014-11-15T10:23:42.0394511+02:00</Time> 
     30    </Item> 
     31    <Item> 
     32      <Source>maa.png</Source> 
     33      <Name>maa</Name> 
     34      <Importer>TextureImporter</Importer> 
     35      <Processor>TextureProcessor</Processor> 
     36      <Options>None</Options> 
     37      <Output>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\maa.xnb</Output> 
     38      <Time>2014-11-15T10:23:41.9302511+02:00</Time> 
     39    </Item> 
     40    <Item> 
     41      <Source>ruoho.png</Source> 
     42      <Name>ruoho</Name> 
     43      <Importer>TextureImporter</Importer> 
     44      <Processor>TextureProcessor</Processor> 
     45      <Options>None</Options> 
     46      <Output>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\ruoho.xnb</Output> 
     47      <Time>2014-11-15T10:23:41.9302511+02:00</Time> 
     48    </Item> 
     49    <Item> 
     50      <Source>Player3.png</Source> 
     51      <Name>Player3</Name> 
     52      <Importer>TextureImporter</Importer> 
     53      <Processor>TextureProcessor</Processor> 
     54      <Options>None</Options> 
     55      <Output>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3.xnb</Output> 
     56      <Time>2014-11-15T10:23:41.9458511+02:00</Time> 
     57    </Item> 
     58    <Item> 
     59      <Source>Player3juoksu1.png</Source> 
     60      <Name>Player3juoksu1</Name> 
     61      <Importer>TextureImporter</Importer> 
     62      <Processor>TextureProcessor</Processor> 
     63      <Options>None</Options> 
     64      <Output>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3juoksu1.xnb</Output> 
     65      <Time>2014-11-15T10:23:41.9458511+02:00</Time> 
     66    </Item> 
     67    <Item> 
     68      <Source>Player3juoksu2.png</Source> 
     69      <Name>Player3juoksu2</Name> 
     70      <Importer>TextureImporter</Importer> 
     71      <Processor>TextureProcessor</Processor> 
     72      <Options>None</Options> 
     73      <Output>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3juoksu2.xnb</Output> 
     74      <Time>2014-11-15T10:23:41.9458511+02:00</Time> 
    3075    </Item> 
    3176    <Item> 
     
    3580      <Processor>TextFileContentProcessor</Processor> 
    3681      <Options>None</Options> 
    37       <Output>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\kentta1.xnb</Output> 
    38       <Time>2014-10-18T13:22:26.2553109+03:00</Time> 
    39     </Item> 
    40     <Item> 
    41       <Source>ruoho.png</Source> 
    42       <Name>ruoho</Name> 
    43       <Importer>TextureImporter</Importer> 
    44       <Processor>TextureProcessor</Processor> 
    45       <Options>None</Options> 
    46       <Output>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\ruoho.xnb</Output> 
    47       <Time>2014-09-20T12:37:53.9505191+03:00</Time> 
    48     </Item> 
    49     <Item> 
    50       <Source>maa.png</Source> 
    51       <Name>maa</Name> 
    52       <Importer>TextureImporter</Importer> 
    53       <Processor>TextureProcessor</Processor> 
    54       <Options>None</Options> 
    55       <Output>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\maa.xnb</Output> 
    56       <Time>2014-09-20T12:35:21.9763889+03:00</Time> 
    57     </Item> 
    58     <Item> 
    59       <Source>Player3.png</Source> 
    60       <Name>Player3</Name> 
    61       <Importer>TextureImporter</Importer> 
    62       <Processor>TextureProcessor</Processor> 
    63       <Options>None</Options> 
    64       <Output>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3.xnb</Output> 
    65       <Time>2014-09-20T13:17:38.9223793+03:00</Time> 
    66     </Item> 
    67     <Item> 
    68       <Source>Player3juoksu1.png</Source> 
    69       <Name>Player3juoksu1</Name> 
    70       <Importer>TextureImporter</Importer> 
    71       <Processor>TextureProcessor</Processor> 
    72       <Options>None</Options> 
    73       <Output>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3juoksu1.xnb</Output> 
    74       <Time>2014-09-20T13:18:16.6746505+03:00</Time> 
    75     </Item> 
    76     <Item> 
    77       <Source>Player3juoksu2.png</Source> 
    78       <Name>Player3juoksu2</Name> 
    79       <Importer>TextureImporter</Importer> 
    80       <Processor>TextureProcessor</Processor> 
    81       <Options>None</Options> 
    82       <Output>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3juoksu2.xnb</Output> 
    83       <Time>2014-09-20T13:18:22.3045127+03:00</Time> 
     82      <Output>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\kentta1.xnb</Output> 
     83      <Time>2014-11-15T10:23:41.9458511+02:00</Time> 
    8484    </Item> 
    8585    <BuildSuccessful>true</BuildSuccessful> 
     
    9090      <BuildConfiguration>Debug</BuildConfiguration> 
    9191      <CompressContent>false</CompressContent> 
    92       <RootDirectory>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_GameContent\</RootDirectory> 
    93       <LoggerRootDirectory>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\</LoggerRootDirectory> 
    94       <IntermediateDirectory>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\obj\x86\Debug\</IntermediateDirectory> 
    95       <OutputDirectory>C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\</OutputDirectory> 
     92      <RootDirectory>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_GameContent\</RootDirectory> 
     93      <LoggerRootDirectory>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\</LoggerRootDirectory> 
     94      <IntermediateDirectory>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\obj\x86\Debug\</IntermediateDirectory> 
     95      <OutputDirectory>C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\</OutputDirectory> 
    9696    </Settings> 
    9797    <Assemblies> 
     
    130130      <Assembly> 
    131131        <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> 
    132         <Value>2012-07-09T09:56:07.3404899+03:00</Value> 
     132        <Value>2014-04-23T00:30:18.4504836+03:00</Value> 
    133133      </Assembly> 
    134134    </Assemblies> 
  • 2014/koodauskerho/38/OttoR/Z_Game/Z_Game/Z_Game/obj/x86/Debug/Z_Game.csproj.FileListAbsolute.txt

    r5761 r5770  
    1616C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3juoksu2.xnb 
    1717C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_Game\obj\x86\Debug\Z_Game.csprojResolveAssemblyReference.cache 
     18C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\maali.xnb 
     19C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\norsu.xnb 
     20C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\tahti.xnb 
     21C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\maa.xnb 
     22C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\ruoho.xnb 
     23C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3.xnb 
     24C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3juoksu1.xnb 
     25C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\Player3juoksu2.xnb 
     26C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Content\kentta1.xnb 
     27C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Z_Game.exe 
     28C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Z_Game.pdb 
     29C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Jypeli.dll 
     30C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\bin\x86\Debug\Jypeli.xml 
     31C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\obj\x86\Debug\Z_Game.csprojResolveAssemblyReference.cache 
     32C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
     33C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\obj\x86\Debug\Z_Game.exe 
     34C:\MyTemp\OttoR\Z_Game\Z_Game\Z_Game\obj\x86\Debug\Z_Game.pdb 
  • 2014/koodauskerho/38/OttoR/Z_Game/Z_Game/Z_Game/obj/x86/Debug/cachefile-{ABA5B0B1-2E94-4679-923C-981499C2D96C}-targetpath.txt

    r5737 r5770  
    22Content\norsu.xnb 
    33Content\tahti.xnb 
    4 Content\kentta1.xnb 
     4Content\maa.xnb 
    55Content\ruoho.xnb 
    6 Content\maa.xnb 
    76Content\Player3.xnb 
    87Content\Player3juoksu1.xnb 
    98Content\Player3juoksu2.xnb 
     9Content\kentta1.xnb 
  • 2014/koodauskerho/38/OttoR/Z_Game/Z_Game/Z_GameContent/Z_GameContent.contentproj

    r5737 r5770  
    102102    </Compile> 
    103103  </ItemGroup> 
     104  <ItemGroup> 
     105    <Compile Include="Tikkaat.png"> 
     106      <Name>Tikkaat</Name> 
     107      <Importer>TextureImporter</Importer> 
     108      <Processor>TextureProcessor</Processor> 
     109    </Compile> 
     110  </ItemGroup> 
    104111  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    105112  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
  • 2014/koodauskerho/38/OttoR/Z_Game/Z_Game/Z_GameContent/obj/x86/Debug/Z_GameContent.contentproj.FileListAbsolute.txt

    r5737 r5770  
    11C:\MyTemp\OttoRolig\Z_Game\Z_Game\Z_GameContent\obj\x86\Debug\Z_GameContent.contentprojResolveAssemblyReference.cache 
     2C:\MyTemp\OttoR\Z_Game\Z_Game\Z_GameContent\obj\x86\Debug\Z_GameContent.contentprojResolveAssemblyReference.cache 
Note: See TracChangeset for help on using the changeset viewer.