Changeset 9271 for 2016


Ignore:
Timestamp:
2017-07-31 14:59:00 (10 months ago)
Author:
npo17_88
Message:
 
Location:
2016/30/HenriJ/qq/qq
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • 2016/30/HenriJ/qq/qq/qq/obj/x86/Debug/ContentPipeline-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}.xml

    r8416 r9271  
    88      <Processor>SoundEffectProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\maali.xnb</Output> 
    11       <Time>2017-03-18T10:27:44.5091032+02:00</Time> 
     10      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\maali.xnb</Output> 
     11      <Time>2017-07-31T12:50:55.3944881+03:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
    19       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\norsu.xnb</Output> 
    20       <Time>2017-03-18T10:27:44.6027038+02:00</Time> 
     19      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\norsu.xnb</Output> 
     20      <Time>2017-07-31T12:50:55.5036909+03:00</Time> 
    2121    </Item> 
    2222    <Item> 
     
    2626      <Processor>TextureProcessor</Processor> 
    2727      <Options>None</Options> 
    28       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\tahti.xnb</Output> 
    29       <Time>2017-03-18T10:27:44.6807043+02:00</Time> 
     28      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\tahti.xnb</Output> 
     29      <Time>2017-07-31T12:50:55.6128937+03:00</Time> 
    3030    </Item> 
    3131    <Item> 
     
    3535      <Processor>TextureProcessor</Processor> 
    3636      <Options>None</Options> 
    37       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\puuseina.xnb</Output> 
    38       <Time>2017-03-18T10:27:44.6807043+02:00</Time> 
     37      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\puuseina.xnb</Output> 
     38      <Time>2017-07-31T12:50:55.6128937+03:00</Time> 
    3939    </Item> 
    4040    <Item> 
     
    4444      <Processor>TextureProcessor</Processor> 
    4545      <Options>None</Options> 
    46       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\sankari.xnb</Output> 
    47       <Time>2017-03-18T10:27:44.6807043+02:00</Time> 
     46      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\sankari.xnb</Output> 
     47      <Time>2017-07-31T12:50:55.6128937+03:00</Time> 
    4848    </Item> 
    4949    <Item> 
     
    5353      <Processor>TextureProcessor</Processor> 
    5454      <Options>None</Options> 
    55       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\Loota.xnb</Output> 
    56       <Time>2017-03-18T10:27:44.5247033+02:00</Time> 
     55      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\Loota.xnb</Output> 
     56      <Time>2017-07-31T12:50:55.4100885+03:00</Time> 
    5757    </Item> 
    5858    <Item> 
     
    6262      <Processor>TextureProcessor</Processor> 
    6363      <Options>None</Options> 
    64       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\bom.xnb</Output> 
    65       <Time>2017-03-18T10:27:44.5091032+02:00</Time> 
     64      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\bom.xnb</Output> 
     65      <Time>2017-07-31T12:50:55.4100885+03:00</Time> 
    6666    </Item> 
    6767    <Item> 
     
    7171      <Processor>TextureProcessor</Processor> 
    7272      <Options>None</Options> 
    73       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\Laatikko.xnb</Output> 
    74       <Time>2017-03-18T10:27:44.5247033+02:00</Time> 
     73      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\Laatikko.xnb</Output> 
     74      <Time>2017-07-31T12:50:55.4100885+03:00</Time> 
    7575    </Item> 
    7676    <Item> 
     
    8080      <Processor>TextFileContentProcessor</Processor> 
    8181      <Options>None</Options> 
    82       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\kentta1.xnb</Output> 
    83       <Time>2017-03-18T10:27:44.5247033+02:00</Time> 
     82      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\kentta1.xnb</Output> 
     83      <Time>2017-07-31T14:56:39.5971521+03:00</Time> 
    8484    </Item> 
    8585    <Item> 
     
    8989      <Processor>TextFileContentProcessor</Processor> 
    9090      <Options>None</Options> 
    91       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\kentta2.xnb</Output> 
    92       <Time>2017-03-18T10:57:48.2792432+02:00</Time> 
     91      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\kentta2.xnb</Output> 
     92      <Time>2017-07-31T12:50:55.4256889+03:00</Time> 
    9393    </Item> 
    9494    <Item> 
     
    9898      <Processor>TextFileContentProcessor</Processor> 
    9999      <Options>None</Options> 
    100       <Output>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\kentta3.xnb</Output> 
    101       <Time>2017-03-18T14:16:18.293424+02:00</Time> 
     100      <Output>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\kentta3.xnb</Output> 
     101      <Time>2017-07-31T12:50:55.4256889+03:00</Time> 
    102102    </Item> 
    103103    <BuildSuccessful>true</BuildSuccessful> 
     
    108108      <BuildConfiguration>Debug</BuildConfiguration> 
    109109      <CompressContent>false</CompressContent> 
    110       <RootDirectory>C:\MyTemp\HenriJ\qq\qq\qqContent\</RootDirectory> 
    111       <LoggerRootDirectory>C:\MyTemp\HenriJ\qq\qq\qq\</LoggerRootDirectory> 
    112       <IntermediateDirectory>C:\MyTemp\HenriJ\qq\qq\qq\obj\x86\Debug\</IntermediateDirectory> 
    113       <OutputDirectory>C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\</OutputDirectory> 
     110      <RootDirectory>C:\MyTemp\HenriJ2\qq\qq\qqContent\</RootDirectory> 
     111      <LoggerRootDirectory>C:\MyTemp\HenriJ2\qq\qq\qq\</LoggerRootDirectory> 
     112      <IntermediateDirectory>C:\MyTemp\HenriJ2\qq\qq\qq\obj\x86\Debug\</IntermediateDirectory> 
     113      <OutputDirectory>C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\</OutputDirectory> 
    114114    </Settings> 
    115115    <Assemblies> 
     
    148148      <Assembly> 
    149149        <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> 
    150         <Value>2015-09-16T19:58:56.2786477+03:00</Value> 
     150        <Value>2017-06-07T16:14:29.6067091+03:00</Value> 
    151151      </Assembly> 
    152152    </Assemblies> 
  • 2016/30/HenriJ/qq/qq/qq/obj/x86/Debug/qq.csproj.FileListAbsolute.txt

    r8407 r9271  
    1818C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\kentta2.xnb 
    1919C:\MyTemp\HenriJ\qq\qq\qq\bin\x86\Debug\Content\kentta3.xnb 
     20C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\maali.xnb 
     21C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\norsu.xnb 
     22C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\tahti.xnb 
     23C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\puuseina.xnb 
     24C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\sankari.xnb 
     25C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\Loota.xnb 
     26C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\bom.xnb 
     27C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\Laatikko.xnb 
     28C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\kentta1.xnb 
     29C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\kentta2.xnb 
     30C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Content\kentta3.xnb 
     31C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\qq.exe 
     32C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\qq.pdb 
     33C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Jypeli.dll 
     34C:\MyTemp\HenriJ2\qq\qq\qq\bin\x86\Debug\Jypeli.xml 
     35C:\MyTemp\HenriJ2\qq\qq\qq\obj\x86\Debug\qq.csprojResolveAssemblyReference.cache 
     36C:\MyTemp\HenriJ2\qq\qq\qq\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
     37C:\MyTemp\HenriJ2\qq\qq\qq\obj\x86\Debug\qq.exe 
     38C:\MyTemp\HenriJ2\qq\qq\qq\obj\x86\Debug\qq.pdb 
  • 2016/30/HenriJ/qq/qq/qq/qq.cs

    r8416 r9271  
    1010{ 
    1111    const double nopeus = 500; 
    12     const double hyppyNopeus = 1000; 
     12    const double hyppyNopeus = 1020; 
    1313    const int RUUDUN_KOKO = 40; 
    1414    bool kutistettu = false; 
    15  
     15     
    1616    Image seina = LoadImage("puuseina"); 
    1717    Image loota = LoadImage("Loota"); 
     
    2424    Image tahtiKuva = LoadImage("tahti"); 
    2525 
    26     SoundEffect maaliAani = LoadSoundEffect("maali"); 
    27  
    28     int Kenttanro = 2; 
     26 
     27    int Kenttanro = 1; 
    2928 
    3029    public override void Begin() 
     
    4039        else if (Kenttanro == 3) LuoKentta("kentta3"); 
    4140 
     41        Mouse.IsCursorVisible = true; 
    4242 
    4343        Gravity = new Vector(0, -1000); 
     
    6666        kentta.SetTileMethod('*', LisaaTahti); 
    6767        kentta.SetTileMethod('N', LisaaPelaaja); 
     68        kentta.SetTileMethod('o', LisaaKone); 
     69        kentta.SetTileMethod('k', LisaaKone2); 
    6870        kentta.Execute(RUUDUN_KOKO, RUUDUN_KOKO); 
    6971        Level.CreateBorders(); 
     
    146148        taso.Image = loota; 
    147149        taso.Tag = "tnt"; 
     150        taso.CanRotate = false; 
     151        taso.LinearDamping = 0.96; 
    148152        Add(taso); 
    149153    } 
     
    155159        taso.Tag = "block"; 
    156160        taso.CanRotate = false; 
    157         //AddCollisionHandler(taso, "trap", Ansal); 
     161        AddCollisionHandler(taso, "trap", Ansal); 
     162        taso.LinearDamping = 0.96; 
     163        taso.Mass = 20; 
    158164        Add(taso); 
    159165    }   
     
    181187        Add(pelaaja1); 
    182188    } 
     189 
     190 
     191    void LisaaKone(Vector paikka, double leveys, double korkeus) 
     192    { 
     193        PhysicsObject taso = PhysicsObject.CreateStaticObject(leveys, korkeus); 
     194        taso.Position = paikka; 
     195        taso.Tag = "block"; 
     196        taso.Color = Color.DarkGray; 
     197        Timer ajastin2 = new Timer(); 
     198        ajastin2.Interval = 0.5; 
     199        ajastin2.Timeout += delegate { LisaaLoota2(paikka, 40, 40); }; 
     200        ajastin2.Start(5); 
     201        Add(taso); 
     202    } 
     203 
     204    void LisaaKone2(Vector paikka, double leveys, double korkeus) 
     205    { 
     206        PhysicsObject taso = PhysicsObject.CreateStaticObject(leveys, korkeus); 
     207        taso.Position = paikka; 
     208        taso.Tag = "block"; 
     209        taso.Color = Color.Black; 
     210        Timer ajastin2 = new Timer(); 
     211        ajastin2.Interval = 5; 
     212        ajastin2.Timeout += delegate { LisaaLoota(paikka, 40, 40); }; 
     213        ajastin2.Start(5); 
     214        Add(taso); 
     215    } 
     216 
     217     
    183218    void Ansal(PhysicsObject pelaaja1, PhysicsObject trap) 
    184219    { 
     
    240275    void TormaaTahteen(PhysicsObject hahmo, PhysicsObject tahti) 
    241276    { 
    242         maaliAani.Play(); 
    243277        tahti.Destroy(); 
    244278        Kenttanro += 1; 
     
    254288        Timer.SingleShot(10, delegate { pelaaja1.Size = koko; kutistettu = false; }); 
    255289    } 
     290 
     291 
     292 
     293 
     294 
     295 
    256296} 
  • 2016/30/HenriJ/qq/qq/qqContent/kentta1.txt

    r8399 r9271  
    1 hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh.............y............hhh 
    2 h..N...........................h.............y............hhh 
    3 h..............................h.............y............hhh 
    4 h..............................h.............y............hhh 
    5 h..........t.....t.............4.............y............hhh 
    6 h..........y.....y.............h.............h............hhh 
    7 h..............................h........hh...h............hhh 
    8 4lll...................tt....tth.............h..tttttttttthhh 
    9 hyyyhhhhhhh1hhhhh1hhhhhhh..hhhhh.............h..hhhhhhhhhhhhh 
    10 h..............................h.............h.............hh 
    11 h..............................h..hh.........h.............hh 
    12 h..............................h.............hhhh..........hh 
    13 h..............................h.............h.............hh 
    14 h4.......................ll....h........hh...h.............hh 
    15 hhh..hhhhhhhhhhhhhhhhhhhhhhhhhhh.............h.............hh 
    16 h........................yy..................httttttttt....hh 
    17 h........................yy.ll...............3yyyyyyyyy....hh 
    18 hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh1h1h1h1hhhhh.............hh 
    19 hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh.............hh 
    20 h..........................................................hh 
    21 h..........................................................hh 
    22 h..hhhhhhhhhhhhhhhh1hhhh1hhhh1hhhh1hhhhhhhhhhhhhhhhhhhhhhhhhh 
    23 h...................ty......................................h 
    24 h...................ty.....y........y........y............*.h 
    25 4llly...............ty......................................h 
    26 hyyyhh..hhhhhhhhhhhhhhhhhhhthhhhhhhhthhhhhhhhthhhhhhhhhhhhhhh 
    27 h.......hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 
    28 h.......hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 
    29 hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 
     1........................................................................................................h 
     2........................................................................................................h 
     3........................................................................................................h 
     4........................................................................................................h 
     5........................................................................................................h 
     6........................................................................................................h 
     7hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhohhhohhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 
     8h.......................................................................................................h 
     9h.......................................................................................................h 
     10h.......................................................................................................h 
     11h.......................................................................................................h 
     12h.......................................................................................................h 
     13h.......................................................................................................h 
     144444444444..............................................................................................h 
     154444444444..............................................................................................h 
     164444444444..............................................................................................h 
     174444444444..............................................................................................h 
     184444444444..............................................................................................h 
     194444444444..............................................................................................h 
     204444444444..............................................................................................h 
     214444444444..............................................................................................h 
     224444444444.........................................N....................................................h 
     23hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 
  • 2016/30/HenriJ/qq/qq/qqContent/obj/x86/Debug/qqContent.contentproj.FileListAbsolute.txt

    r8260 r9271  
    11C:\MyTemp\HenriJ\qq\qq\qqContent\obj\x86\Debug\qqContent.contentprojResolveAssemblyReference.cache 
     2C:\MyTemp\HenriJ2\qq\qq\qqContent\obj\x86\Debug\qqContent.contentprojResolveAssemblyReference.cache 
Note: See TracChangeset for help on using the changeset viewer.