Changeset 4967


Ignore:
Timestamp:
2014-06-12 12:52:11 (5 years ago)
Author:
anlakane
Message:
 
Location:
2014/24/EemeliK
Files:
476 added
16 edited

Legend:

Unmodified
Added
Removed
  • 2014/24/EemeliK/DigToChina/DigToChina.sln

    r4943 r4967  
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigToChinaContent", "DigToChina\DigToChinaContent\DigToChinaContent.contentproj", "{C1A9DCFA-3949-45CB-A7B3-D4F2525DDD48}" 
    77EndProject 
    8 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jypeli", "Muokattu Jypeli\Jypeli.csproj", "{74DD1DDD-283D-45D7-A79D-3DCB120708A6}" 
     8Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jypeli", "..\MuokattuJypeli\Jypeli.csproj", "{74DD1DDD-283D-45D7-A79D-3DCB120708A6}" 
    99EndProject 
    1010Global 
  • 2014/24/EemeliK/DigToChina/DigToChina/DigToChina/DigToChina.cs

    r4965 r4967  
    6262    Image GoldGray = LoadImage("GoldGray"); 
    6363    Image GoldDarkGrey = LoadImage("GoldDarkGrey"); 
     64    Image DiamondGray = LoadImage("DiamondGray"); 
     65    Image DiamondDarkGray = LoadImage("DiamondDarkGray"); 
     66    Image DiamondBlack = LoadImage("DiamondBlack"); 
    6467 
    6568    public override void Begin() 
     
    8184        Add(fysOlioita); 
    8285 
    83         Keyboard.Listen(Key.Q, ButtonState.Pressed, KauppaIkkuna, null); 
    84  
    85          
     86        Keyboard.Listen(Key.Q, ButtonState.Pressed, CheatIkkuna, null); 
     87        Keyboard.Listen(Key.E, ButtonState.Pressed, KauppaIkkuna, null); 
     88 
     89 
    8690    } 
    8791 
    8892    void KauppaIkkuna() 
    8993    { 
    90         MultiSelectWindow valikko = new MultiSelectWindow("Cheat Valikko","Pickaxe", "Lopeta"); 
     94        MultiSelectWindow valikko = new MultiSelectWindow("Cheat Valikko", "Pickaxe", "Lopeta"); 
     95        //valikko.ItemSelected += PainettiinNappia; 
     96        valikko.AddItemHandler(0, EnabloiKranaatti); 
     97        Add(valikko); 
     98    } 
     99 
     100    void EnabloiKranaatti() 
     101    { 
     102        Keyboard.Listen(Key.LeftControl, ButtonState.Pressed, HeitaKranaatti, "Heitä kranaatti"); 
     103 
     104    } 
     105 
     106    void HeitaKranaatti() 
     107    { 
     108        Grenade g = new Grenade(100); 
     109        g.Position = tyyppi.Position; 
     110        Add(g); 
     111        g.Hit(Vector.FromLengthAndAngle(1000, Angle.RightAngle)); 
     112    } 
     113 
     114    void CheatIkkuna() 
     115    { 
     116        MultiSelectWindow valikko = new MultiSelectWindow("Cheat Valikko", "Pickaxe", "Lopeta"); 
    91117        valikko.ItemSelected += PainettiinValikonNappia; 
    92118        Add(valikko); 
     
    99125            case 0: 
    100126                tyyppiAse.FireRate = 2000000000000000000; 
    101                  
     127 
    102128                break; 
    103129            case 1: 
     
    137163        ruudut.SetTileMethod('v', LuoValeSeina, Color.Gray, 2, 0); 
    138164        ruudut.SetTileMethod('o', LuoValeSeina, Color.DarkGray, 3, 0); 
    139         ruudut.SetTileMethod('i', LuoValeSeina, Color.HotPink, 3, 2); 
    140         ruudut.SetTileMethod('q', LuoValeSeina, Color.Red, 3, 2); 
    141         ruudut.SetTileMethod('e', LuoValeSeina, Color.Gold, 3, 2); 
    142         ruudut.SetTileMethod('t', LuoValeSeina, Color.Black, 5, 2); 
    143         ruudut.SetTileMethod('p', LuoValeSeina, Color.Blue, 3, 2); 
    144         ruudut.SetTileMethod('u', LuoValeSeina, Color.Azure, 2, 1); 
    145         ruudut.SetTileMethod('y', LuoValeSeina, Color.Rose, 2, 1); 
    146         ruudut.SetTileMethod('x', LuoValeSeina, Color.SpringGreen, 2, 1); 
     165        ruudut.SetTileMethod('i', LuoValeSeina, Color.HotPink, iron, 3, 2); 
     166        ruudut.SetTileMethod('q', LuoValeSeina, Color.Red, ironi, 3, 2); 
     167        ruudut.SetTileMethod('e', LuoValeSeina, Color.Gold, ironii, 3, 2); 
     168        ruudut.SetTileMethod('t', LuoValeSeina, Color.Black, ironiii, 5, 2); 
     169        ruudut.SetTileMethod('p', LuoValeSeina, Color.Blue, CopperBrown, 3, 2); 
     170        ruudut.SetTileMethod('u', LuoValeSeina, Color.Azure, CopperGray, 2, 1); 
     171        ruudut.SetTileMethod('y', LuoValeSeina, Color.Rose, CopperDarkGray, 2, 1); 
     172        ruudut.SetTileMethod('x', LuoValeSeina, Color.SpringGreen, CopperBlack, 2, 1); 
    147173        ruudut.SetTileMethod('0', LuoValeSeina, Color.YellowGreen, 2, 1); 
    148174        ruudut.SetTileMethod('a', LuoValeSeina, Color.Olive, 2, 3); 
    149175        ruudut.SetTileMethod('s', LuoValeSeina, Color.JungleGreen, 2, 3); 
     176        // timantit.....Gray, DarkGray ja Black 
     177        ruudut.SetTileMethod('d', LuoValeSeina, Color.Emerald, 4, 5); 
     178        ruudut.SetTileMethod('m', LuoValeSeina, Color.PaintDotNetMagenta, 4, 5); 
     179        ruudut.SetTileMethod('n', LuoValeSeina, Color.Transparent, 4, 5); 
    150180        ruudut.SetTileMethod('=', LuoPalikka, Color.Gray, 0); 
    151181        ruudut.SetTileMethod('P', LuoPelaaja); 
     
    220250        if (ammus == null) return; 
    221251        ammus.IsVisible = true; 
    222         ammus.Size = new Vector (100, 100); 
    223  
    224         ammus.MaximumLifetime = TimeSpan.FromMilliseconds(10000000); 
     252        ammus.Size = new Vector(1000, 1000); 
     253 
     254        ammus.MaximumLifetime = TimeSpan.FromMilliseconds(1000); 
    225255    } 
    226256 
     
    232262    } 
    233263 
    234     void LuoValeSeina(Vector paikka, double leveys, double korkeus, IntPoint posInLevel, Color vari, int kesto, int pisteet) 
     264    void LuoValeSeina(Vector paikka, double leveys, double korkeus, IntPoint posInLevel, Color vari, Image kuva, int kesto, int pisteet) 
    235265    { 
    236266        GameObject valeseina = new GameObject(leveys, korkeus); 
     
    284314            valeseina.Image = GoldDarkGrey; 
    285315        } 
     316        if (vari == Color.Emerald) 
     317        { 
     318            valeseina.Image = DiamondGray; 
     319        } 
     320        if (vari == Color.PaintDotNetMagenta) 
     321        { 
     322            valeseina.Image = DiamondDarkGray; 
     323        } 
     324        if (vari == Color.Transparent) 
     325        { 
     326            valeseina.Image = DiamondBlack; 
     327        } 
    286328        Add(valeseina); 
    287329    } 
     
    340382        return false; 
    341383    } 
    342      
    343384} 
  • 2014/24/EemeliK/DigToChina/DigToChina/DigToChina/DigToChina.csproj

    r4943 r4967  
    119119  </ItemGroup> 
    120120  <ItemGroup> 
    121     <ProjectReference Include="..\..\Muokattu Jypeli\Jypeli.csproj"> 
     121    <ProjectReference Include="..\..\..\MuokattuJypeli\Jypeli.csproj"> 
    122122      <Project>{74DD1DDD-283D-45D7-A79D-3DCB120708A6}</Project> 
    123123      <Name>Jypeli</Name> 
  • 2014/24/EemeliK/DigToChina/DigToChina/DigToChina/DigToChina.csproj.Debug.cachefile

    r4965 r4967  
    1515Content\GoldDarkGrey.xnb 
    1616Content\Lapioo.xnb 
     17Content\DiamondBlack.xnb 
     18Content\DiamondBrown.xnb 
     19Content\DiamondDarkGray.xnb 
     20Content\DiamondGray.xnb 
    1721Content\kentta.txt 
    1822Content\AsRifle.xnb 
  • 2014/24/EemeliK/DigToChina/DigToChina/DigToChina/obj/x86/Debug/ContentPipeline-{C1A9DCFA-3949-45CB-A7B3-D4F2525DDD48}.xml

    r4965 r4967  
    1818      <Options>None</Options> 
    1919      <Output>C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\kentta.xnb</Output> 
    20       <Time>2014-06-11T13:39:16.503267+03:00</Time> 
     20      <Time>2014-06-12T10:06:28.814878+03:00</Time> 
    2121    </Item> 
    2222    <Item> 
     
    145145      <Output>C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\Lapioo.xnb</Output> 
    146146      <Time>2014-06-11T14:35:45.5663881+03:00</Time> 
     147    </Item> 
     148    <Item> 
     149      <Source>DiamondBlack.png</Source> 
     150      <Name>DiamondBlack</Name> 
     151      <Importer>TextureImporter</Importer> 
     152      <Processor>TextureProcessor</Processor> 
     153      <Options>None</Options> 
     154      <Output>C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\DiamondBlack.xnb</Output> 
     155      <Time>2014-06-12T09:51:29.0539109+03:00</Time> 
     156    </Item> 
     157    <Item> 
     158      <Source>DiamondBrown.png</Source> 
     159      <Name>DiamondBrown</Name> 
     160      <Importer>TextureImporter</Importer> 
     161      <Processor>TextureProcessor</Processor> 
     162      <Options>None</Options> 
     163      <Output>C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\DiamondBrown.xnb</Output> 
     164      <Time>2014-06-12T09:51:34.2534308+03:00</Time> 
     165    </Item> 
     166    <Item> 
     167      <Source>DiamondDarkGray.png</Source> 
     168      <Name>DiamondDarkGray</Name> 
     169      <Importer>TextureImporter</Importer> 
     170      <Processor>TextureProcessor</Processor> 
     171      <Options>None</Options> 
     172      <Output>C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\DiamondDarkGray.xnb</Output> 
     173      <Time>2014-06-12T09:51:37.4367491+03:00</Time> 
     174    </Item> 
     175    <Item> 
     176      <Source>DiamondGray.png</Source> 
     177      <Name>DiamondGray</Name> 
     178      <Importer>TextureImporter</Importer> 
     179      <Processor>TextureProcessor</Processor> 
     180      <Options>None</Options> 
     181      <Output>C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\DiamondGray.xnb</Output> 
     182      <Time>2014-06-12T09:51:41.0621116+03:00</Time> 
    147183    </Item> 
    148184    <BuildSuccessful>true</BuildSuccessful> 
  • 2014/24/EemeliK/DigToChina/DigToChina/DigToChina/obj/x86/Debug/DigToChina.csproj.FileListAbsolute.txt

    r4965 r4967  
    4545C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\GoldGray.xnb 
    4646C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\Lapioo.xnb 
     47C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\DiamondBlack.xnb 
     48C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\DiamondBrown.xnb 
     49C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\DiamondDarkGray.xnb 
     50C:\MyTemp\EemeliK\DigToChina\DigToChina\DigToChina\bin\x86\Debug\Content\DiamondGray.xnb 
  • 2014/24/EemeliK/DigToChina/DigToChina/DigToChina/obj/x86/Debug/cachefile-{C1A9DCFA-3949-45CB-A7B3-D4F2525DDD48}-targetpath.txt

    r4965 r4967  
    1515Content\GoldDarkGrey.xnb 
    1616Content\Lapioo.xnb 
     17Content\DiamondBlack.xnb 
     18Content\DiamondBrown.xnb 
     19Content\DiamondDarkGray.xnb 
     20Content\DiamondGray.xnb 
    1721Content\kentta.txt 
  • 2014/24/EemeliK/DigToChina/DigToChina/DigToChinaContent/DigToChinaContent.contentproj

    r4965 r4967  
    158158    </Compile> 
    159159  </ItemGroup> 
     160  <ItemGroup> 
     161    <Compile Include="DiamondBlack.png"> 
     162      <Name>DiamondBlack</Name> 
     163      <Importer>TextureImporter</Importer> 
     164      <Processor>TextureProcessor</Processor> 
     165    </Compile> 
     166  </ItemGroup> 
     167  <ItemGroup> 
     168    <Compile Include="DiamondBrown.png"> 
     169      <Name>DiamondBrown</Name> 
     170      <Importer>TextureImporter</Importer> 
     171      <Processor>TextureProcessor</Processor> 
     172    </Compile> 
     173  </ItemGroup> 
     174  <ItemGroup> 
     175    <Compile Include="DiamondDarkGray.png"> 
     176      <Name>DiamondDarkGray</Name> 
     177      <Importer>TextureImporter</Importer> 
     178      <Processor>TextureProcessor</Processor> 
     179    </Compile> 
     180  </ItemGroup> 
     181  <ItemGroup> 
     182    <Compile Include="DiamondGray.png"> 
     183      <Name>DiamondGray</Name> 
     184      <Importer>TextureImporter</Importer> 
     185      <Processor>TextureProcessor</Processor> 
     186    </Compile> 
     187  </ItemGroup> 
    160188  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    161189  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
Note: See TracChangeset for help on using the changeset viewer.