Changeset 9419
- Timestamp:
- 2017-08-04 10:53:53 (5 years ago)
- Location:
- 2017/31/SietseH/peli2017/peli2017
- Files:
-
- 12 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
2017/31/SietseH/peli2017/peli2017/peli2017/obj/x86/Debug/ContentPipeline-{F45E74F7-6804-4569-9C06-A286E5C5EB55}.xml
r9399 r9419 36 36 <Options>None</Options> 37 37 <Output>C:\Users\Omistaja\Documents\Visual Studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\kenttäää.xnb</Output> 38 <Time>2017-08-03T1 4:31:56.042318+03:00</Time>38 <Time>2017-08-03T16:18:43.7450257+03:00</Time> 39 39 </Item> 40 40 <Item> … … 217 217 <Output>C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\sand.xnb</Output> 218 218 <Time>2017-08-03T14:28:12.2749035+03:00</Time> 219 </Item> 220 <Item> 221 <Source>tikkaat2.png</Source> 222 <Name>tikkaat2</Name> 223 <Importer>TextureImporter</Importer> 224 <Processor>TextureProcessor</Processor> 225 <Options>None</Options> 226 <Output>C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\tikkaat2.xnb</Output> 227 <Time>2017-08-03T16:35:02.5481045+03:00</Time> 228 </Item> 229 <Item> 230 <Source>Randomize.wav</Source> 231 <Name>Randomize</Name> 232 <Importer>WavImporter</Importer> 233 <Processor>SoundEffectProcessor</Processor> 234 <Options>None</Options> 235 <Output>C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Randomize.xnb</Output> 236 <Time>2017-08-04T09:45:44.7718866+03:00</Time> 237 </Item> 238 <Item> 239 <Source>Powerup.wav</Source> 240 <Name>Powerup</Name> 241 <Importer>WavImporter</Importer> 242 <Processor>SoundEffectProcessor</Processor> 243 <Options>None</Options> 244 <Output>C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Powerup.xnb</Output> 245 <Time>2017-08-04T09:45:48.8970931+03:00</Time> 246 </Item> 247 <Item> 248 <Source>Pickup_Coin3.wav</Source> 249 <Name>Pickup_Coin3</Name> 250 <Importer>WavImporter</Importer> 251 <Processor>SoundEffectProcessor</Processor> 252 <Options>None</Options> 253 <Output>C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Pickup_Coin3.xnb</Output> 254 <Time>2017-08-04T09:45:52.6472658+03:00</Time> 255 </Item> 256 <Item> 257 <Source>Blip_Select3.wav</Source> 258 <Name>Blip_Select3</Name> 259 <Importer>WavImporter</Importer> 260 <Processor>SoundEffectProcessor</Processor> 261 <Options>None</Options> 262 <Output>C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Blip_Select3.xnb</Output> 263 <Time>2017-08-04T09:45:56.5380967+03:00</Time> 264 </Item> 265 <Item> 266 <Source>Hit_Hurt5.wav</Source> 267 <Name>Hit_Hurt5</Name> 268 <Importer>WavImporter</Importer> 269 <Processor>SoundEffectProcessor</Processor> 270 <Options>None</Options> 271 <Output>C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Hit_Hurt5.xnb</Output> 272 <Time>2017-08-04T10:10:58.819635+03:00</Time> 219 273 </Item> 220 274 <BuildSuccessful>true</BuildSuccessful> -
2017/31/SietseH/peli2017/peli2017/peli2017/obj/x86/Debug/cachefile-{F45E74F7-6804-4569-9C06-A286E5C5EB55}-targetpath.txt
r9399 r9419 23 23 Content\tikkaat.xnb 24 24 Content\sand.xnb 25 Content\tikkaat2.xnb 26 Content\Randomize.xnb 27 Content\Powerup.xnb 28 Content\Pickup_Coin3.xnb 29 Content\Blip_Select3.xnb 30 Content\Hit_Hurt5.xnb -
2017/31/SietseH/peli2017/peli2017/peli2017/obj/x86/Debug/peli2017.csproj.FileListAbsolute.txt
r9399 r9419 31 31 C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\tikkaat.xnb 32 32 C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\sand.xnb 33 C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\tikkaat2.xnb 34 C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Randomize.xnb 35 C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Powerup.xnb 36 C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Pickup_Coin3.xnb 37 C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Blip_Select3.xnb 38 C:\Users\Omistaja\documents\visual studio 2015\Projects\peli2017\peli2017\peli2017\bin\x86\Debug\Content\Hit_Hurt5.xnb -
2017/31/SietseH/peli2017/peli2017/peli2017/peli2017.cs
r9399 r9419 17 17 { 18 18 elamaLaskuri.LowerLimit += delegate { this.Destroy(); }; 19 19 20 } 20 21 } … … 48 49 Vector oikea = new Vector(-5000, 0); 49 50 51 SoundEffect raha = LoadSoundEffect("Pickup_Coin3"); 52 SoundEffect tp = LoadSoundEffect("Randomize"); 53 SoundEffect blip = LoadSoundEffect("Blip_Select3"); 54 SoundEffect pup = LoadSoundEffect("Powerup"); 55 SoundEffect osui = LoadSoundEffect("Hit_Hurt5"); 56 57 58 59 60 50 61 List<Vector> paikat; 51 62 … … 78 89 pisteNaytto.TextColor = Color.Black; 79 90 pisteNaytto.Color = Color.White; 80 81 91 pisteNaytto.BindTo(pisteLaskuri); 82 92 Add(pisteNaytto); 83 93 } 84 85 94 public override void Begin() 86 95 { 87 MultiSelectWindow alkuValikko = new MultiSelectWindow("Pelin alkuvalikko ",96 MultiSelectWindow alkuValikko = new MultiSelectWindow("Pelin alkuvalikko \n peliohjeet TAB", 88 97 "Aloita peli", "Lopeta"); 89 98 Add(alkuValikko); 99 alkuValikko.Closed += (w)=> blip.Play(); 90 100 91 101 … … 103 113 void Ohjaus() 104 114 { 105 Keyboard.Listen(Key.Q, ButtonState.Down, zoom, "", 0.9); 106 Keyboard.Listen(Key.E, ButtonState.Down, zoom, "", 1.1); 115 Keyboard.Listen(Key.Tab, ButtonState.Pressed, ShowControlHelp, ""); 116 Keyboard.Listen(Key.Q, ButtonState.Down, zoom, "zoom", 0.9); 117 Keyboard.Listen(Key.E, ButtonState.Down, zoom, "zoom", 1.1); 107 118 Wasd(); 108 Keyboard.Listen(Key.D1, ButtonState.Pressed, ValitseTyokalu, " ", 1);109 Keyboard.Listen(Key.D2, ButtonState.Pressed, ValitseTyokalu, " ", 2);110 Keyboard.Listen(Key.D3, ButtonState.Pressed, ValitseTyokalu, " ", 3);111 Keyboard.Listen(Key.D4, ButtonState.Pressed, ValitseTyokalu, " ", 4);112 Mouse.Listen(MouseButton.Right, ButtonState.Pressed, KilpiPaalle, " Ammu");113 Mouse.Listen(MouseButton.Right, ButtonState.Released, Kilpipois, " Ammu");114 Mouse.Listen(MouseButton.Left, ButtonState.Pressed, Kaytatyokalua, " ");119 Keyboard.Listen(Key.D1, ButtonState.Pressed, ValitseTyokalu, "valitse jousi", 1); 120 Keyboard.Listen(Key.D2, ButtonState.Pressed, ValitseTyokalu, "valitse kirves", 2); 121 Keyboard.Listen(Key.D3, ButtonState.Pressed, ValitseTyokalu, "valitse hakku", 3); 122 Keyboard.Listen(Key.D4, ButtonState.Pressed, ValitseTyokalu, "valitse keihäs", 4); 123 Mouse.Listen(MouseButton.Right, ButtonState.Pressed, KilpiPaalle, "kilpi kun painettu"); 124 Mouse.Listen(MouseButton.Right, ButtonState.Released, Kilpipois, ""); 125 Mouse.Listen(MouseButton.Left, ButtonState.Pressed, Kaytatyokalua, "käytä työkalua"); 115 126 Mouse.ListenMovement(0.1, Tahtaa, "Tähtää aseella"); 116 127 } … … 267 278 // Mitä tapahtuu kun ammus osuu johonkin? 268 279 Ase.ProjectileCollision = VihollisenAmmusOsui; 280 Ase.AttackSound = null; 269 281 270 282 vihollinen.Add(Ase); 271 vihollinen.Destroyed += delegate { pisteLaskuri.Value += 1; }; 283 vihollinen.Destroyed += delegate 284 { 285 raha.Play(); 286 pisteLaskuri.Value += 1; 287 }; 272 288 273 289 … … 320 336 ElamaLaskuri.Value -= 1; 321 337 ammus.Destroy(); 322 338 osui.Play(); 323 339 } 324 340 } … … 473 489 { 474 490 kenttanimi = "luola"; 491 tp.Play(); 475 492 Aloitapeli(); 476 493 } … … 480 497 481 498 482 Puu puu = new Puu(175.0, 2 25.0);499 Puu puu = new Puu(175.0, 200.0); 483 500 puu.Tag = "puu"; 484 501 puu.Position = paikka; … … 494 511 pisteLaskuri.Value += 1; 495 512 Timer.SingleShot(20, delegate { Puut(paikka, leveys, korkeus); }); 513 raha.Play(); 496 514 }; 497 515 … … 521 539 pisteLaskuri.Value += 1; 522 540 Timer.SingleShot(20, delegate { Kivi(paikka, leveys, korkeus); }); 541 raha.Play(); 523 542 }; 524 543 … … 573 592 { 574 593 kenttanimi = "littlehouse"; 594 tp.Play(); 575 595 Aloitapeli(); 576 596 … … 635 655 { 636 656 kenttanimi = "kenttäää"; 657 tp.Play(); 637 658 Aloitapeli(); 638 659 … … 661 682 tp3.Position = paikka; 662 683 tp3.Tag = "tp3"; 663 //tp3.Image = LoadImage("");684 tp3.Image = LoadImage("tikkaat2"); 664 685 tp3.MakeStatic(); 665 686 Add(tp3); … … 712 733 { 713 734 MultiSelectWindow kauppa = new MultiSelectWindow("Kauppa", 714 "jatka peliä", "kilven kevennys ", "latausnopeus", "kirveen parannus", "hakun parannus", "keihään pituus", "god mode");735 "jatka peliä", "kilven kevennys 50", "latausnopeus 50", "kirveen parannus 50", "hakun parannus 50", "keihään pituus 50", "god mode 1000"); 715 736 Add(kauppa); 716 737 kauppa.Closed += (w) => blip.Play(); 717 738 kauppa.AddItemHandler(0, ratka); 718 739 kauppa.AddItemHandler(1, Kilvenkevennys); … … 756 777 { 757 778 pisteLaskuri.Value -= 50; 758 779 pup.Play(); 759 780 kilpikerroin += 0.1; 760 781 } … … 779 800 tulinopeus += 1.0; 780 801 laserAse.FireRate = tulinopeus; 802 pup.Play(); 781 803 782 804 } … … 796 818 pisteLaskuri.Value -= 50; 797 819 lyomisenteho -= 1; 798 820 pup.Play(); 799 821 } 800 822 else … … 811 833 pisteLaskuri.Value -= 50; 812 834 lyomisen2teho -= 1; 813 835 pup.Play(); 814 836 815 837 } … … 827 849 pisteLaskuri.Value -= 50; 828 850 pidennuksenmaara += 20; 829 851 pup.Play(); 830 852 } 831 853 else … … 841 863 { 842 864 843 if (pisteLaskuri.Value >= 5000)844 { 845 pisteLaskuri.Value -= 5000;865 if (pisteLaskuri.Value >= 1000) 866 { 867 pisteLaskuri.Value -= 1000; 846 868 ylös = new Vector(ylös.X * 1, ylös.Y * 10); 847 869 alas = new Vector(alas.X * 1, alas.Y * 10); … … 858 880 Keyboard.Disable(Key.S); 859 881 Keyboard.Disable(Key.D); 882 pup.Play(); 860 883 Wasd(); 861 884 } … … 873 896 { 874 897 (puu as Puu).ElamaLaskuri.AddValue(lyomisenteho); 898 875 899 } 876 900 … … 881 905 { 882 906 (kivi as Kivi).ElamaLaskuri.AddValue(lyomisen2teho); 883 907 884 908 } 885 909 -
2017/31/SietseH/peli2017/peli2017/peli2017/peli2017.csproj.Debug.cachefile
r9399 r9419 23 23 Content\tikkaat.xnb 24 24 Content\sand.xnb 25 Content\tikkaat2.xnb 26 Content\Randomize.xnb 27 Content\Powerup.xnb 28 Content\Pickup_Coin3.xnb 29 Content\Blip_Select3.xnb 30 Content\Hit_Hurt5.xnb -
2017/31/SietseH/peli2017/peli2017/peli2017Content/peli2017Content.contentproj
r9399 r9419 213 213 </Compile> 214 214 </ItemGroup> 215 <ItemGroup> 216 <Compile Include="tikkaat2.png"> 217 <Name>tikkaat2</Name> 218 <Importer>TextureImporter</Importer> 219 <Processor>TextureProcessor</Processor> 220 </Compile> 221 </ItemGroup> 222 <ItemGroup> 223 <Compile Include="Randomize.wav"> 224 <Name>Randomize</Name> 225 <Importer>WavImporter</Importer> 226 <Processor>SoundEffectProcessor</Processor> 227 </Compile> 228 </ItemGroup> 229 <ItemGroup> 230 <Compile Include="Powerup.wav"> 231 <Name>Powerup</Name> 232 <Importer>WavImporter</Importer> 233 <Processor>SoundEffectProcessor</Processor> 234 </Compile> 235 </ItemGroup> 236 <ItemGroup> 237 <Compile Include="Pickup_Coin3.wav"> 238 <Name>Pickup_Coin3</Name> 239 <Importer>WavImporter</Importer> 240 <Processor>SoundEffectProcessor</Processor> 241 </Compile> 242 </ItemGroup> 243 <ItemGroup> 244 <Compile Include="Blip_Select3.wav"> 245 <Name>Blip_Select3</Name> 246 <Importer>WavImporter</Importer> 247 <Processor>SoundEffectProcessor</Processor> 248 </Compile> 249 </ItemGroup> 250 <ItemGroup> 251 <Compile Include="Hit_Hurt5.wav"> 252 <Name>Hit_Hurt5</Name> 253 <Importer>WavImporter</Importer> 254 <Processor>SoundEffectProcessor</Processor> 255 </Compile> 256 </ItemGroup> 215 257 <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 216 258 <!-- 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.