Changeset 6971 for 2015


Ignore:
Timestamp:
2015-07-23 11:49:43 (4 years ago)
Author:
nikranna
Message:
 
Location:
2015/30/ArttuH/TasoHyppely
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • 2015/30/ArttuH/TasoHyppely/TasoHyppely/TasoHyppely/TasoHyppely.cs

    r6962 r6971  
    1212    const double hyppyNopeus = 750; 
    1313    const int RUUDUN_KOKO = 40; 
    14     double ammusnopeus2 = 1000; 
     14    double ammusnopeus2 = 1500; 
    1515    double pahisNopeus = 100; 
    1616    double Painovoima = -1000; 
     
    168168        pelaaja2.AnimWalk = pelihahmo2; 
    169169        pelaaja2.Weapon = new AssaultRifle(50, 10); 
    170         pelaaja2.Weapon.FireRate = 2; 
     170        pelaaja2.Weapon.FireRate = 1; 
    171171        pelaaja2.Weapon.Image = null; 
    172172        pelaaja2.Weapon.Image = asekuva2; 
     
    232232        pisteNaytto.Y = Screen.Top - pistelaskurin_Y; 
    233233        pisteNaytto.TextColor = Color.Brown; 
    234         pisteNaytto.Color = Color.AshGray; 
     234        pisteNaytto.Color = Color.Wheat; 
    235235        pisteNaytto.Title = "Suklaa"; 
    236236 
     
    290290        if (ammus != null) 
    291291        { 
    292             pelaaja2.Weapon.Angle += Angle.FromDegrees(RandomGen.NextInt(-50, 20)); 
     292            pelaaja2.Weapon.Angle += Angle.FromDegrees(RandomGen.NextInt(-1, 1)); 
    293293            ammus.Size *= 0.8; 
     294            ammus.Mass = 5000; 
    294295            ammus.Image = luoti; 
    295296            luotilaskuri2.Value--; 
    296297            ammus.Velocity = pelaaja2.Weapon.Angle.GetVector().Normalize() * ammusnopeus2; 
    297298            ControllerTwo.Vibrate(100.16, 100.16, 0.16, 0.16, 0.1); 
    298             ammus.MaximumLifetime = TimeSpan.FromSeconds(1.0); 
     299            ammus.MaximumLifetime = TimeSpan.FromSeconds(1.3); 
    299300        } 
    300301    } 
  • 2015/30/ArttuH/TasoHyppely/TasoHyppely/TasoHyppelyContent/obj/x86/Debug/ContentPipeline.xml

    r6962 r6971  
    99      <Options>None</Options> 
    1010      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\maali.xnb</Output> 
    11       <Time>2015-07-23T09:33:25.8480023+03:00</Time> 
     11      <Time>2015-07-23T11:36:28.1893018+03:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1818      <Options>None</Options> 
    1919      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\Pickup_Coin21.xnb</Output> 
    20       <Time>2015-07-23T09:33:25.9728023+03:00</Time> 
     20      <Time>2015-07-23T11:36:28.3453018+03:00</Time> 
    2121    </Item> 
    2222    <Item> 
     
    2727      <Options>None</Options> 
    2828      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\norsu.xnb</Output> 
    29       <Time>2015-07-23T09:33:25.8948023+03:00</Time> 
     29      <Time>2015-07-23T11:36:28.2517018+03:00</Time> 
    3030    </Item> 
    3131    <Item> 
     
    3636      <Options>None</Options> 
    3737      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\tahti.xnb</Output> 
    38       <Time>2015-07-23T09:33:25.9728023+03:00</Time> 
     38      <Time>2015-07-23T11:36:28.3297018+03:00</Time> 
    3939    </Item> 
    4040    <Item> 
     
    4545      <Options>None</Options> 
    4646      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\toinenukkoanimaatio\toinenukkoanimaatio1.xnb</Output> 
    47       <Time>2015-07-23T09:33:26.0508023+03:00</Time> 
     47      <Time>2015-07-23T11:36:28.4077018+03:00</Time> 
    4848    </Item> 
    4949    <Item> 
     
    5454      <Options>None</Options> 
    5555      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\toinenukkoanimaatio\toinenukkoanimaatio2.xnb</Output> 
    56       <Time>2015-07-23T09:33:26.0508023+03:00</Time> 
     56      <Time>2015-07-23T11:36:28.4077018+03:00</Time> 
    5757    </Item> 
    5858    <Item> 
     
    6363      <Options>None</Options> 
    6464      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\ukkoanimaatio\ukkoanimaatio1.xnb</Output> 
    65       <Time>2015-07-23T09:33:25.8948023+03:00</Time> 
     65      <Time>2015-07-23T11:36:28.2517018+03:00</Time> 
    6666    </Item> 
    6767    <Item> 
     
    7272      <Options>None</Options> 
    7373      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\ukkoanimaatio\ukkoanimaatio2.xnb</Output> 
    74       <Time>2015-07-23T09:33:25.8948023+03:00</Time> 
     74      <Time>2015-07-23T11:36:28.2517018+03:00</Time> 
    7575    </Item> 
    7676    <Item> 
     
    8181      <Options>None</Options> 
    8282      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\toinenukko.xnb</Output> 
    83       <Time>2015-07-23T09:33:26.0508023+03:00</Time> 
     83      <Time>2015-07-23T11:36:28.4077018+03:00</Time> 
    8484    </Item> 
    8585    <Item> 
     
    9090      <Options>None</Options> 
    9191      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\ukko.xnb</Output> 
    92       <Time>2015-07-23T09:33:25.9728023+03:00</Time> 
     92      <Time>2015-07-23T11:36:28.3297018+03:00</Time> 
    9393    </Item> 
    9494    <Item> 
     
    9999      <Options>None</Options> 
    100100      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\suklaa.xnb</Output> 
    101       <Time>2015-07-23T09:33:25.9884023+03:00</Time> 
     101      <Time>2015-07-23T11:36:28.3453018+03:00</Time> 
    102102    </Item> 
    103103    <Item> 
     
    108108      <Options>None</Options> 
    109109      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\pahis2.xnb</Output> 
    110       <Time>2015-07-23T09:33:26.0352023+03:00</Time> 
     110      <Time>2015-07-23T11:36:28.4077018+03:00</Time> 
    111111    </Item> 
    112112    <Item> 
     
    117117      <Options>None</Options> 
    118118      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\orkki.xnb</Output> 
    119       <Time>2015-07-23T09:33:25.9884023+03:00</Time> 
     119      <Time>2015-07-23T11:36:28.3297018+03:00</Time> 
    120120    </Item> 
    121121    <Item> 
     
    126126      <Options>None</Options> 
    127127      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\asekuva.xnb</Output> 
    128       <Time>2015-07-23T09:33:25.8792023+03:00</Time> 
     128      <Time>2015-07-23T11:36:28.2205018+03:00</Time> 
    129129    </Item> 
    130130    <Item> 
     
    135135      <Options>None</Options> 
    136136      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\asekuva_2.xnb</Output> 
    137       <Time>2015-07-23T09:33:25.9884023+03:00</Time> 
     137      <Time>2015-07-23T11:36:28.3453018+03:00</Time> 
    138138    </Item> 
    139139    <Item> 
     
    144144      <Options>None</Options> 
    145145      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\luoti.xnb</Output> 
    146       <Time>2015-07-23T09:33:25.8480023+03:00</Time> 
     146      <Time>2015-07-23T11:36:28.1893018+03:00</Time> 
    147147    </Item> 
    148148    <Item> 
     
    153153      <Options>None</Options> 
    154154      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\piikki.xnb</Output> 
    155       <Time>2015-07-23T09:33:25.9884023+03:00</Time> 
     155      <Time>2015-07-23T11:36:28.3453018+03:00</Time> 
    156156    </Item> 
    157157    <Item> 
     
    162162      <Options>None</Options> 
    163163      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\toinenukkoanimaatio.xnb</Output> 
    164       <Time>2015-07-23T09:33:25.9728023+03:00</Time> 
     164      <Time>2015-07-23T11:36:28.3297018+03:00</Time> 
    165165      <Request>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\toinenukkoanimaatio\toinenukkoanimaatio1.xnb</Request> 
    166166      <Request>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\toinenukkoanimaatio\toinenukkoanimaatio2.xnb</Request> 
     
    173173      <Options>None</Options> 
    174174      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\ukkoanimaatio.xnb</Output> 
    175       <Time>2015-07-23T09:33:25.8480023+03:00</Time> 
     175      <Time>2015-07-23T11:36:28.1893018+03:00</Time> 
    176176      <Request>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\ukkoanimaatio\ukkoanimaatio1.xnb</Request> 
    177177      <Request>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\ukkoanimaatio\ukkoanimaatio2.xnb</Request> 
     
    184184      <Options>None</Options> 
    185185      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\Kentta2.xnb</Output> 
    186       <Time>2015-07-23T09:59:39.5346308+03:00</Time> 
     186      <Time>2015-07-23T11:36:28.2205018+03:00</Time> 
    187187    </Item> 
    188188    <Item> 
     
    193193      <Options>None</Options> 
    194194      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\kentta3.xnb</Output> 
    195       <Time>2015-07-23T09:59:39.5346308+03:00</Time> 
     195      <Time>2015-07-23T11:36:28.2517018+03:00</Time> 
    196196    </Item> 
    197197    <Item> 
     
    202202      <Options>None</Options> 
    203203      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\Kentta1.xnb</Output> 
    204       <Time>2015-07-23T09:59:39.5502334+03:00</Time> 
     204      <Time>2015-07-23T11:36:28.2205018+03:00</Time> 
    205205    </Item> 
    206206    <Item> 
     
    212212      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\Gaslamp_Funworks.xnb</Output> 
    213213      <Extra>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\Gaslamp_Funworks.wma</Extra> 
    214       <Time>2015-07-23T09:33:25.8636023+03:00</Time> 
     214      <Time>2015-07-23T11:36:28.2049018+03:00</Time> 
    215215    </Item> 
    216216    <Item> 
     
    221221      <Options>None</Options> 
    222222      <Output>C:\MyTemp\ArttuH\TasoHyppely\TasoHyppely\TasoHyppely\bin\x86\Debug\Content\ammobox.xnb</Output> 
    223       <Time>2015-07-23T11:04:10.7811018+03:00</Time> 
     223      <Time>2015-07-23T11:36:28.2205018+03:00</Time> 
    224224    </Item> 
    225225    <BuildSuccessful>true</BuildSuccessful> 
Note: See TracChangeset for help on using the changeset viewer.