Changeset 9678


Ignore:
Timestamp:
2018-06-07 14:56:16 (18 months ago)
Author:
ilmrauti
Message:
 
Location:
2018/23/ILMARIR/gemstorehhh
Files:
26 added
23 edited

Legend:

Unmodified
Added
Removed
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/Content/Content.mgcb

    r9612 r9678  
    170170/build:(maisema).png 
    171171 
     172#begin puu.png 
     173/importer:TextureImporter 
     174/processor:TextureProcessor 
     175/processorParam:ColorKeyColor=255,0,255,255 
     176/processorParam:ColorKeyEnabled=True 
     177/processorParam:GenerateMipmaps=False 
     178/processorParam:PremultiplyAlpha=True 
     179/processorParam:ResizeToPowerOfTwo=False 
     180/processorParam:MakeSquare=False 
     181/processorParam:TextureFormat=Color 
     182/build:puu.png 
     183 
     184#begin safiiri.morko.gif 
     185/importer:TextureImporter 
     186/processor:TextureProcessor 
     187/processorParam:ColorKeyColor=255,0,255,255 
     188/processorParam:ColorKeyEnabled=True 
     189/processorParam:GenerateMipmaps=False 
     190/processorParam:PremultiplyAlpha=True 
     191/processorParam:ResizeToPowerOfTwo=False 
     192/processorParam:MakeSquare=False 
     193/processorParam:TextureFormat=Color 
     194/build:safiiri.morko.gif 
     195 
     196#begin morko1.png 
     197/importer:TextureImporter 
     198/processor:TextureProcessor 
     199/processorParam:ColorKeyColor=255,0,255,255 
     200/processorParam:ColorKeyEnabled=True 
     201/processorParam:GenerateMipmaps=False 
     202/processorParam:PremultiplyAlpha=True 
     203/processorParam:ResizeToPowerOfTwo=False 
     204/processorParam:MakeSquare=False 
     205/processorParam:TextureFormat=Color 
     206/build:morko1.png 
     207 
     208#begin morko2.png 
     209/importer:TextureImporter 
     210/processor:TextureProcessor 
     211/processorParam:ColorKeyColor=255,0,255,255 
     212/processorParam:ColorKeyEnabled=True 
     213/processorParam:GenerateMipmaps=False 
     214/processorParam:PremultiplyAlpha=True 
     215/processorParam:ResizeToPowerOfTwo=False 
     216/processorParam:MakeSquare=False 
     217/processorParam:TextureFormat=Color 
     218/build:morko2.png 
     219 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/Content/kentta1.txt

    r9612 r9678  
    1  
    2  
    3                               
    4         
     1                VVVV 
     2               ####### 
     3                       
     4               %%%%%%%   %%%%% 
    55            
    6             
    7             
    8            N 
    9  
    10  
    11  
    12                  
    13  
    14  
    15  
    16 %%%%%%%%%%%%%%%%%%%%%%%%%%% 
    17  
    18  
    19  
    20  
     6                                      V 
     7                                     %%%%%%% 
     8                                             V 
     9                                 %%%%%%%%%       V 
     10% %  ##                                          %%%%%%%% 
     11#N# #### 
     12########                                      V 
     13#      #                                   %%%%%%%% 
     14# V                     V                  V             V    
     15######## V         V   %%%%          V   %%%%%%%%%%%%%%%%%%%%%%%%   
     16%%%%%%%%%%%      %%%%%%%%%%%%        %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
     17%%%%%%%%%%%LLLLLL%%%%%%%%%%%%LLLLLLLL%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
     18%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
     19%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
     20%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
     21%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/Content/obj/DesktopGL/(maisema).mgcontent

    r9612 r9678  
    22<PipelineBuildEvent xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    33  <SourceFile>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/(maisema).png</SourceFile> 
    4   <SourceTime>2018-06-06T14:10:19+03:00</SourceTime> 
     4  <SourceTime>2018-06-06T14:34:25.2578635+03:00</SourceTime> 
    55  <DestFile>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/bin/DesktopGL/(maisema).xnb</DestFile> 
    6   <DestTime>2018-06-06T14:13:51.7350733+03:00</DestTime> 
     6  <DestTime>2018-06-07T10:19:09.1740373+03:00</DestTime> 
    77  <Importer>TextureImporter</Importer> 
    88  <ImporterTime>2017-03-01T17:05:36+02:00</ImporterTime> 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/Content/obj/DesktopGL/.mgcontent

    r9612 r9678  
    1919    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/elama0.png</File> 
    2020    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/(maisema).png</File> 
     21    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/puu.png</File> 
     22    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/safiiri.morko.gif</File> 
     23    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/morko1.png</File> 
     24    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/morko2.png</File> 
    2125  </SourceFiles> 
    2226</SourceFileCollection> 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/Content/obj/DesktopGL/New Piskel.mgcontent

    r9612 r9678  
    44  <SourceTime>2018-06-05T14:52:00.5857249+03:00</SourceTime> 
    55  <DestFile>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/bin/DesktopGL/New Piskel.xnb</DestFile> 
    6   <DestTime>2018-06-06T14:13:51.7038243+03:00</DestTime> 
     6  <DestTime>2018-06-07T11:30:24.2454686+03:00</DestTime> 
    77  <Importer>TextureImporter</Importer> 
    88  <ImporterTime>2017-03-01T17:05:36+02:00</ImporterTime> 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/Content/obj/DesktopGL/kentta1.mgcontent

    r9612 r9678  
    22<PipelineBuildEvent xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    33  <SourceFile>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/kentta1.txt</SourceFile> 
    4   <SourceTime>2018-06-06T11:35:15.2526637+03:00</SourceTime> 
     4  <SourceTime>2018-06-07T11:13:16.3499487+03:00</SourceTime> 
    55  <DestFile>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/bin/DesktopGL/kentta1.xnb</DestFile> 
    6   <DestTime>2018-06-06T14:13:51.5319497+03:00</DestTime> 
     6  <DestTime>2018-06-07T11:13:34.0436882+03:00</DestTime> 
    77  <Importer>TextFileImporter</Importer> 
    88  <ImporterTime>2018-01-11T19:43:12+02:00</ImporterTime> 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/Content/obj/Windows/.mgcontent

    r9612 r9678  
    1919    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/elama0.png</File> 
    2020    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/(maisema).png</File> 
     21    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/puu.png</File> 
     22    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/safiiri.morko.gif</File> 
     23    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/morko1.png</File> 
     24    <File>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/morko2.png</File> 
    2125  </SourceFiles> 
    2226</SourceFileCollection> 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/Content/obj/Windows/New Piskel.mgcontent

    r9612 r9678  
    44  <SourceTime>2018-06-05T14:52:00.5857249+03:00</SourceTime> 
    55  <DestFile>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/bin/Windows/New Piskel.xnb</DestFile> 
    6   <DestTime>2018-06-06T14:38:19.1216697+03:00</DestTime> 
     6  <DestTime>2018-06-07T14:48:01.1574105+03:00</DestTime> 
    77  <Importer>TextureImporter</Importer> 
    88  <ImporterTime>2017-03-01T17:05:36+02:00</ImporterTime> 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/Content/obj/Windows/kentta1.mgcontent

    r9612 r9678  
    22<PipelineBuildEvent xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    33  <SourceFile>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/kentta1.txt</SourceFile> 
    4   <SourceTime>2018-06-06T14:38:04.2992735+03:00</SourceTime> 
     4  <SourceTime>2018-06-07T14:48:00.4801094+03:00</SourceTime> 
    55  <DestFile>C:/MyTemp/pelikurssi2018/viikko23/ILMARIR/gemstorehhh/gemstorehhh/Content/bin/Windows/kentta1.xnb</DestFile> 
    6   <DestTime>2018-06-06T14:38:04.9793513+03:00</DestTime> 
     6  <DestTime>2018-06-07T14:48:01.0623985+03:00</DestTime> 
    77  <Importer>TextFileImporter</Importer> 
    88  <ImporterTime>2018-01-11T19:43:12+02:00</ImporterTime> 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/gemstorehhh.cs

    r9612 r9678  
    3838    { 
    3939        TileMap kentta = TileMap.FromLevelAsset("kentta1"); 
    40         kentta.SetTileMethod('#', LisaaTaso); 
     40        kentta.SetTileMethod('#', LisaaPuu); 
    4141        kentta.SetTileMethod('*', LisaaTahti); 
    4242        kentta.SetTileMethod('N', LisaaPelaaja); 
    43         kentta.SetTileMethod('%', LisaaPuuta); 
     43        kentta.SetTileMethod('%', LisaaTaso); 
     44        kentta.SetTileMethod('L', LisaaLaava); 
    4445        kentta.SetTileMethod('V', luovihollinen); 
    4546        kentta.Execute(RUUDUN_KOKO, RUUDUN_KOKO); 
     
    5253    } 
    5354 
     55    private void LisaaLaava(Vector position, double width, double height) 
     56    { 
     57        PhysicsObject laava = PhysicsObject.CreateStaticObject(width, height); 
     58        laava.Position = position; 
     59        laava.Color = Color.Red; 
     60        laava.Tag = "laava"; 
     61        Add(laava); 
     62    } 
    5463 
    5564    void LisaaTahti(Vector paikka, double leveys, double korkeus) 
     
    7281        pelaaja1.AnimIdle = pelaajanKuva; 
    7382        AddCollisionHandler(pelaaja1, "tahti", TormaaTahteen); 
     83        AddCollisionHandler(pelaaja1, "laava", Osuulaavaan); 
    7484        Add(pelaaja1); 
    7585        elamabaari = new GameObject(15, 15); 
     
    7787        elamabaari.Y += 15; 
    7888        elamabaari.Image = elamakuvat[3]; 
     89        elamalaskuri.LowerLimit += ElamatLoppui; 
    7990 
    8091        AddCollisionHandler(pelaaja1, "vihu", Pelaajaosuumorkoon); 
    8192 
    8293    } 
    83     void LisaaPuuta(Vector paikka, double leveys, double korkeus) 
    84     { 
    85         PhysicsObject puu = PhysicsObject.CreateStaticObject(leveys, korkeus); 
    86         puu.Position = paikka; 
    87         puu.Color = Color.Gray; 
    88         Add(puu); 
     94 
     95    private void Osuulaavaan(PhysicsObject pelaaja, PhysicsObject laava) 
     96    { 
     97        pelaaja.Destroy(); 
     98        ElamatLoppui(); 
     99    } 
     100 
     101    private void ElamatLoppui() 
     102    { 
     103        ClearAll(); 
     104        elamalaskuri.Value = elamalaskuri.MaxValue; 
     105        Begin(); 
     106        elamabaari.Image = elamakuvat[elamalaskuri.Value-1]; 
     107    } 
     108 
     109    void LisaaTaso(Vector paikka, double leveys, double korkeus) 
     110    { 
     111        PhysicsObject taso = PhysicsObject.CreateStaticObject(leveys, korkeus); 
     112        taso.Position = paikka; 
     113 
     114        taso.Color = Color.Gray; 
     115        Add(taso); 
    89116    } 
    90117 
     
    137164        tahti.Destroy(); 
    138165    } 
    139     void LisaaTaso(Vector paikka, double leveys, double korkeus) 
    140     { 
    141         PhysicsObject taso = PhysicsObject.CreateStaticObject(leveys, korkeus); 
    142         taso.Position = paikka; 
    143         taso.Color = Color.Aqua; 
    144         Add(taso); 
     166    void LisaaPuu(Vector paikka, double leveys, double korkeus) 
     167    { 
     168        PhysicsObject puu = PhysicsObject.CreateStaticObject(leveys, korkeus); 
     169        puu.Position = paikka; 
     170        puu.Image = LoadImage("puu"); 
     171 
     172        Add(puu); 
    145173    } 
    146174 
     
    160188 
    161189        morko.Brain = tasoAivot; 
     190 
     191        morko.AnimWalk = new Animation(Image.Mirror(LoadImage( "morko1")), Image.Mirror(LoadImage("morko2"))); 
     192        //morko.Animation.FPS = 1; 
    162193        morko.Tag = "vihu"; 
    163194 
     
    167198    void Pelaajaosuumorkoon(PhysicsObject Pelaaja1, PhysicsObject minimorko) 
    168199    { 
     200        if (Pelaaja1.Velocity.Y < 0) 
     201        { 
     202            minimorko.Destroy(); 
     203            return; 
     204        } 
    169205        elamalaskuri.Value -= 1; 
    170         elamabaari.Image = elamakuvat[elamalaskuri.Value]; 
     206        elamabaari.Image = elamakuvat[elamalaskuri.Value-1]; 
    171207    } 
    172208 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/obj/x86/Debug/gemstorehhh.csproj.CoreCompileInputs.cache

    r9612 r9678  
    1 73c76a5508913ed81dd6f6c287f59a766cc83e9a 
     1bf0f6ab239d9839a15f83bd25585ff047f722997 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/obj/x86/Debug/gemstorehhh.csproj.FileListAbsolute.txt

    r9612 r9678  
    7676C:\MyTemp\pelikurssi2018\viikko23\ILMARIR\gemstorehhh\gemstorehhh\bin\Windows\Debug\Content\elama3.xnb 
    7777C:\MyTemp\pelikurssi2018\viikko23\ILMARIR\gemstorehhh\gemstorehhh\bin\Windows\Debug\Content\(maisema).xnb 
     78C:\MyTemp\pelikurssi2018\viikko23\ILMARIR\gemstorehhh\gemstorehhh\bin\Windows\Debug\Content\puu.xnb 
     79C:\MyTemp\pelikurssi2018\viikko23\ILMARIR\gemstorehhh\gemstorehhh\bin\Windows\Debug\Content\safiiri.morko.xnb 
     80C:\MyTemp\pelikurssi2018\viikko23\ILMARIR\gemstorehhh\gemstorehhh\bin\Windows\Debug\Content\morko1.xnb 
     81C:\MyTemp\pelikurssi2018\viikko23\ILMARIR\gemstorehhh\gemstorehhh\bin\Windows\Debug\Content\morko2.xnb 
  • 2018/23/ILMARIR/gemstorehhh/gemstorehhh/obj/x86/Release/gemstorehhh.csproj.CoreCompileInputs.cache

    r9612 r9678  
    1 73c76a5508913ed81dd6f6c287f59a766cc83e9a 
     1bf0f6ab239d9839a15f83bd25585ff047f722997 
Note: See TracChangeset for help on using the changeset viewer.