Changeset 4981


Ignore:
Timestamp:
2014-06-12 14:56:29 (9 years ago)
Author:
noaialha
Message:
 
Location:
2014/24/NooraH/Diamond
Files:
4 added
15 edited

Legend:

Unmodified
Added
Removed

  • 2014/24/NooraH/Diamond/Diamond/Diamond/Diamond.cs

    r4973 r4981  
    1919    Image pahiskuva = LoadImage("Pahis"); 
    2020    Image hahmokuva; 
    21  
    22     Image[] hahmokuvat = LoadImages("Hympi", "Hahmo2", "Pink", "häntukka"); 
     21    Image Siilikuva = LoadImage("Siili"); 
     22    Image Piikki = LoadImage("Piikki"); 
     23 
     24    Image[] hahmokuvat = LoadImages("Hympi", "Hahmo2", "Pink", "häntukka", "Muvail"); 
    2325 
    2426    SoundEffect maaliAani = LoadSoundEffect("maali"); 
    … …  
    3638    void ValitseHahmo() 
    3739    { 
    38         MultiSelectWindow hahmoValikko = new MultiSelectWindow("Valitse Hahmo", "Hympi ", "Korsi", "Pink", "häntukka"); 
     40        MultiSelectWindow hahmoValikko = new MultiSelectWindow("Valitse Hahmo", "Hympi ", "Korsi", "Pink", "häntukka", "Muvail"); 
    3941        Add(hahmoValikko); 
    4042 
    … …  
    4244        { 
    4345            int indeksi = i; 
     46            hahmoValikko.Buttons[i].Image = hahmokuvat[i]; 
     47            hahmoValikko.Buttons[i].TextScale *= 3; 
     48            hahmoValikko.Buttons[i].TextColor = Color.Red; 
    4449            hahmoValikko.AddItemHandler(indeksi, delegate 
    4550            { 
    … …  
    7277        kentta.SetTileMethod('N', LisaaPelaaja); 
    7378        kentta.SetTileMethod('P', LisaaPahis); 
    74         kentta.SetTileMethod('O', LisaaPallo); 
    7579        kentta.SetTileMethod('u', LisaaTaso5); 
    7680        kentta.SetTileMethod('s', LisaaTaso6); 
    7781        kentta.SetTileMethod('R', LisaaTayte1); 
    7882        kentta.SetTileMethod('r', LisaaTayte2); 
     83        kentta.SetTileMethod('S', LisaaSiili); 
    7984        kentta.SetTileMethod('M', LisaaMaali); 
     85        kentta.SetTileMethod('I', LisaaPiikki); 
    8086        kentta.Execute(RUUDUN_KOKO, RUUDUN_KOKO); 
    8187        Level.CreateBorders(); 
    … …  
    197203    } 
    198204 
    199  
    200     void LisaaPallo(Vector paikka, double leveys = 20, double korkeus = 20) 
    201     { 
    202         PhysicsObject pallo = new PhysicsObject(leveys / 2, korkeus / 2); 
    203         Add(pallo); 
    204         pallo.Shape = Shape.Circle; 
    205         pallo.Color = Color.Black; 
    206         pallo.Position = paikka; 
    207     } 
    208  
    209205    void painovoimamuuttuu(PhysicsObject hahmo, PhysicsObject taso) 
    210206    { 
    … …  
    232228        return tayte; 
    233229    } 
    234  
    235230     
    236231 
    … …  
    270265        Teksti.TextScale = new Vector(5, 5); 
    271266    } 
     267    void LisaaSiili(Vector paikka, double leveys, double korkeus) 
     268    { 
     269 
     270        PlatformCharacter Pahis = new PlatformCharacter(leveys, korkeus); 
     271        Add(Pahis); 
     272        Pahis.Position = paikka; 
     273        Pahis.Image = Siilikuva; 
     274        Pahis.Tag = "vaara"; 
     275        Timer ajastin = new Timer(); 
     276        ajastin.Interval = 1.2; 
     277        ajastin.Timeout += delegate 
     278        { 
     279            Pahis.Jump(650); 
     280        }; 
     281        ajastin.Start(); 
     282    } 
     283 
     284    void LisaaPiikki(Vector paikka, double leveys, double korkeus) 
     285    { 
     286 
     287        PhysicsObject Piikki1 = PhysicsObject.CreateStaticObject(leveys, korkeus/2); 
     288        Add(Piikki1); 
     289        Piikki1.Position = new Vector(paikka.X,paikka.Y-korkeus*0.25); 
     290        Piikki1.Image = Piikki; 
     291        Piikki1.Tag = "vaara"; 
     292    } 
    272293} 

  • 2014/24/NooraH/Diamond/Diamond/Diamond/Diamond.csproj.Debug.cachefile

    r4973 r4981  
    1515Content\hÀntukka.xnb 
    1616Content\Maali.xnb 
     17Content\Muvail.xnb 
     18Content\Piikki.xnb 

  • 2014/24/NooraH/Diamond/Diamond/Diamond/obj/x86/Debug/ContentPipeline-{1A7E25CE-F3A7-4CC7-9EF9-562C53D5D0D2}.xml

    r4973 r4981  
    3636      <Options>None</Options> 
    3737      <Output>C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\kentta1.xnb</Output> 
    38       <Time>2014-06-12T13:19:45.2897966+03:00</Time> 
     38      <Time>2014-06-12T14:53:50.906779+03:00</Time> 
    3939    </Item> 
    4040    <Item> 
    … …  
    4545      <Options>None</Options> 
    4646      <Output>C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\Siili.xnb</Output> 
    47       <Time>2014-06-11T10:03:36.9687268+03:00</Time> 
     47      <Time>2014-06-12T14:08:14.5479338+03:00</Time> 
    4848    </Item> 
    4949    <Item> 
    … …  
    145145      <Output>C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\Maali.xnb</Output> 
    146146      <Time>2014-06-12T13:14:12.8835593+03:00</Time> 
     147    </Item> 
     148    <Item> 
     149      <Source>Muvail.png</Source> 
     150      <Name>Muvail</Name> 
     151      <Importer>TextureImporter</Importer> 
     152      <Processor>TextureProcessor</Processor> 
     153      <Options>None</Options> 
     154      <Output>C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\Muvail.xnb</Output> 
     155      <Time>2014-06-12T13:56:01.7838356+03:00</Time> 
     156    </Item> 
     157    <Item> 
     158      <Source>Piikki.png</Source> 
     159      <Name>Piikki</Name> 
     160      <Importer>TextureImporter</Importer> 
     161      <Processor>TextureProcessor</Processor> 
     162      <Options>None</Options> 
     163      <Output>C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\Piikki.xnb</Output> 
     164      <Time>2014-06-12T14:51:59.2055078+03:00</Time> 
    147165    </Item> 
    148166    <BuildSuccessful>true</BuildSuccessful> 

  • 2014/24/NooraH/Diamond/Diamond/Diamond/obj/x86/Debug/Diamond.csproj.FileListAbsolute.txt

    r4973 r4981  
    2323C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\hympi.xnb 
    2424C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\hÀntukka.xnb 
     25C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\Muvail.xnb 
     26C:\MyTemp\NooraH\Diamond\Diamond\Diamond\bin\x86\Debug\Content\Piikki.xnb 

  • 2014/24/NooraH/Diamond/Diamond/Diamond/obj/x86/Debug/cachefile-{1A7E25CE-F3A7-4CC7-9EF9-562C53D5D0D2}-targetpath.txt

    r4973 r4981  
    1515Content\hÀntukka.xnb 
    1616Content\Maali.xnb 
     17Content\Muvail.xnb 
     18Content\Piikki.xnb 

  • 2014/24/NooraH/Diamond/Diamond/DiamondContent/DiamondContent.contentproj

    r4973 r4981  
    157157    </Compile> 
    158158  </ItemGroup> 
     159  <ItemGroup> 
     160    <Compile Include="Muvail.png"> 
     161      <Name>Muvail</Name> 
     162      <Importer>TextureImporter</Importer> 
     163      <Processor>TextureProcessor</Processor> 
     164    </Compile> 
     165  </ItemGroup> 
     166  <ItemGroup> 
     167    <Compile Include="Piikki.png"> 
     168      <Name>Piikki</Name> 
     169      <Importer>TextureImporter</Importer> 
     170      <Processor>TextureProcessor</Processor> 
     171    </Compile> 
     172  </ItemGroup> 
    159173  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    160174  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  

  • 2014/24/NooraH/Diamond/Diamond/DiamondContent/kentta1.txt

    r4973 r4981  
    55t                                                                                                                            *****   T 
    66t ss                                                                                                                         *****   T 
    7 tTTT                               P               ***         p         P          ******                                   ttttt  Tt          
    8 t                            TTTTTtTTTT  t  t  ttttTTTtTttt  Tttt   TtTTttttttT   TTtTTtttt                                        ttt 
    9      T                      tRRRrrRrRrt        tRRrrrrrrrrt  tTTt   TTtTttttttt   TTtTttTttt                                     Ttttt 
    10     t N      P********     trrrrrrrrRRR        tRRrrRrrRrrr                                         P * P * P * P * P           TttTtt 
    11 T  tTTTTTTTTTTTTTTTTTTTTTTTrRRrrRRrRRRt        tRrrrrrrRRRT                                     tTTttttttTTtTttTttttTtttt   ttTttttTtTt   
     7tTTT                               P             ** S **       p         P      *******                                    ttttt  Tt          
     8t                            TTTTTtTTTT  t  t  ttttTTTtTttt  Tttt   TtTTttttttTt tTTt   ttt                                        ttt 
     9     T                      tRRRrrRrRrt        tRRrrrrrrrrt  tTTt   TTtTttttttt   TTt   Tttt                                     Ttttt 
     10    t        P *******     trrrrrrrrRRt        tRRrrRrrRrrt                                         P * P * S * P * P           TttTtt 
     11T  tTTTTTTTTTTTTTTTTTTTTTTTrRRrrRRrRRRt        tRrrrrrrRRRT                                     tTTttttttTTtTttTttttTtttt   ttTttttTtT   
    1212rt  tTtttttttTTTTTtttttttttTttttttttttt        tRrRrRrrRRRT                                   ttRRRRRRRRRrrrrrrrrrrrrrrrt            T 
    13 RRt                         *****   **         tRrrrRRrrrrt       P  ********   P     P     tttTRRRRRRrrrrrrrrRRrrrrrrrrT            t 
     13RRt                         *****   **         tRrrrRRrrrrt       P  ********   S    P      tttTRRRRRRrrrrrrrrRRrrrrrrrrT            t 
    1414RrttttttttttttTTTTtttTtTttTttttttttTTtttttttttttRRrrrRrRrRttttttttttttttttTttttttTtttttttttTTTTTTttttttttTtttttTttTtttttT            t 
    1515TRRRRRRRRRRRRrrrrrrrrrrrrrrrrrrrRRRrrrRrrrrrrrrrRRrrrRrrRrrrrrrRRRRrrRRRrRrrrRrrrRrrrRrrrrrrrrrRRRRRRRRRRrrrrrrrRrrrRrrRt            t 
    1616TRRrRrrrRrRRrrrrRrrrrrrrrRRRrRrrrrrrrrRRrRrrrrrrrRRrrrrrrrrRrrrRRrrrRrrrrRrRRrRrRRrRRRrrRRRrRRrRRRRRRRRRRRRRrrrrrrRRrrrRt            T 
    1717tRrrrRRrrrrrrrrRRRRRRrrrrrrrrrrrrrrrrrRRRRrrrRrrrrrrrrRRrrRRRrRrRrRRRRRRRRRRRRRRRRRrrrrrrrrrrrrrrrrrrrRRRRrrRrrrrrrRrrrrT            T 
    18 MMMMMttttttttttttTTtTttttTTTTTTTttttttTTTTTtttTTTTttttTTTTtttttttTTTtttTTTttTtTTtTtTttTttttttTTtttttttTtTTtTtTtTttttttTTT            t 
    19 M   T  T   t              p    *      t     tt     T     tt         p       ttt                 tt          t     t   t u            t 
    20 M   t                t             tt            t          **                     tt                     t             u            T 
    21 M    **     T    P         P          **   ttttt                P     t         t            Tt      t                  u s s s s p  t 
    22 TTtTTTttttttt      tTtt       ttttttttttttTTTTTTTtttttttttttt          ttttttTTTTTTTtTtTtttTtttTTttTtttTTttttttTTttTTTtttttttTtTTtTtttt 
    23 RRrrrRrrrrrrtttttttttttttttttttRRrrrrRRRRrrRRRRrrrRRRrrrrRRRttttttttttttRRRrrrRrrRRrrRRRrrRrrrRrRrRrrRRrrrrRrrrRRRrRRrrrrRRRrrRRRrrrRrR 
     18TTTTTttttttttttttTTtTttttTTTTTTTttttttTTTTTtttTTTTttttTTTTtttttttTTTtttTTTttTtTTtTtTttTttttttTTtttttttTtTTtTtTtTttttttTTT            t 
     19M   T  T   t                   *      t     tt           tt                 ttt                 tt          t     t    u            t 
     20M   t                t             tt             t          **                     tt                     t            u  **** N    T 
     21M    **     T                        **   tttttIIIIIIIII             t          tIIIIIIIIIIIIIIIII Tt      t            u s s s s P  t 
     22TTtTTTttttttt   I  tTtt       ttttttttttttTTTTTTTttttttttttttTTtTTtTTtttttttTTTTTTTtTtTtttTtttTTttTtttTTttttttTTttTTTtttttttTtTTtTtttt 
     23RRrrrRrrrrrrtttttttttttttttttttRRrrrrRRRRrrRRRRrrrRRRrrrrRRRttttttttttttRRRrrrRrrRRrrRRRrrRrrrRrRrRrrRRrrrrRrrrRRRrRRrrrrRRRrrRRRrrrRr 
Note: See TracChangeset for help on using the changeset viewer.