Changeset 2583
- Timestamp:
- 2011-08-05 11:59:38 (12 years ago)
- Location:
- 2011/31/AleksiK
- Files:
-
- 3 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
2011/31/AleksiK/WorkingTitle/WorkingTitle/Peli.cs
r2561 r2583 30 30 Image[] auto1Ampuu = LoadImages("PunAuto", "PunAutoAmpuu", "PunAuto", "PunAutoAmpuu", "PunAuto"); 31 31 Image[] auto2Ampuu = LoadImages("SinAuto", "SinAutoAmpuu", "SinAuto", "SinAutoAmpuu", "SinAuto"); 32 Image kiwi = LoadImage("tiili"); 32 33 Image kiwi1 = LoadImage("punpyl"); 34 Image kiwi2 = LoadImage("sinpyl"); 33 35 34 36 Image rapa = LoadImage("mud"); 37 Image rapas = LoadImage("muds"); 35 38 36 39 Image kentta = LoadImage("sand"); … … 229 232 Smoke kura = new Smoke(); 230 233 kura.ParticleImage = rapa; 234 kura.MaxScale = 0.7; 231 235 kura.Position = auto1.Position + Vector.FromLengthAndAngle(25, (auto1.Angle + Angle.FromDegrees(180))); 232 236 kura.MaximumLifetime = new TimeSpan(0, 0, 0, 2, 0); … … 236 240 Add(kura); 237 241 238 Flame liekki = new Flame(liekinkuva);239 // , 25, Vector.FromLengthAndAngle(25,(auto1.Angle + Angle.FromDegrees(180))));240 liekki.Position = auto1.Position + Vector.FromLengthAndAngle(0, (auto1.Angle + Angle.FromDegrees(180)));241 liekki.Angle = auto1.Angle + Angle.FromDegrees(180);242 liekki.Width = 0.5;243 liekki.MaximumLifetime = new TimeSpan(0, 0, 0, 0, 50);244 liekki.MaxScale = 0.01;245 Add(liekki, -1);242 //Flame liekki = new Flame(liekinkuva); 243 ////, 25, Vector.FromLengthAndAngle(25,(auto1.Angle + Angle.FromDegrees(180)))); 244 //liekki.Position = auto1.Position + Vector.FromLengthAndAngle(0, (auto1.Angle + Angle.FromDegrees(180))); 245 //liekki.Angle = auto1.Angle + Angle.FromDegrees(180); 246 //liekki.Width = 0.5; 247 //liekki.MaximumLifetime = new TimeSpan(0, 0, 0, 0, 50); 248 //liekki.MaxScale = 0.01; 249 //Add(liekki, -1); 246 250 247 251 } … … 250 254 { 251 255 Smoke kura1 = new Smoke(); 252 kura1.ParticleImage = rapa; 256 kura1.ParticleImage = rapas; 257 kura1.MaxScale = 0.7; 253 258 kura1.Position = auto2.Position + Vector.FromLengthAndAngle(25, (auto2.Angle + Angle.FromDegrees(180))); 254 259 kura1.MaximumLifetime = new TimeSpan(0, 0, 0, 2, 0); … … 273 278 274 279 275 PhysicsObject maata = PhysicsObject.CreateStaticObject(150.0, 50.0);276 maata.Shape = Shape.Rectangle;277 maata.Color = Color.DarkGray;278 maata.X = 0;279 maata.Y = 0;280 maata.Restitution = 0.2;281 maata.Tag = "pylvas"; Add(maata, -1);282 283 maata.Angle = Angle.FromDegrees(330.0);284 285 PhysicsObject pylvas1 = PhysicsObject.CreateStaticObject(1 50.0, 50.0);286 pylvas1.Shape = Shape. Rectangle;287 pylvas1.X = - 200;288 pylvas1.Y = 270;280 //PhysicsObject maata = PhysicsObject.CreateStaticObject(100.0, 100.0); 281 //maata.Shape = Shape.Circle; 282 //maata.Color = Color.DarkGray; 283 //maata.X = 0; 284 //maata.Y = 0; 285 //maata.Restitution = 0.2; 286 //maata.Tag = "pylvas"; Add(maata, -1); 287 288 //maata.Angle = Angle.FromDegrees(330.0); 289 290 PhysicsObject pylvas1 = PhysicsObject.CreateStaticObject(100.0, 100.0); 291 pylvas1.Shape = Shape.Circle; 292 pylvas1.X = -100; 293 pylvas1.Y = 0; 289 294 pylvas1.Restitution = 0.2; 290 295 pylvas1.Tag = "pylvas"; … … 292 297 Add(pylvas1, -1); 293 298 294 pylvas1.Angle = Angle.FromDegrees(1 50.0);295 296 PhysicsObject pylvas2 = PhysicsObject.CreateStaticObject(1 50.0, 50.0);297 pylvas2.Shape = Shape. Rectangle;298 pylvas2.X = -3 30;299 pylvas2.Y = 175;299 pylvas1.Angle = Angle.FromDegrees(100.0); 300 301 PhysicsObject pylvas2 = PhysicsObject.CreateStaticObject(100.0, 100.0); 302 pylvas2.Shape = Shape.Circle; 303 pylvas2.X = -300; 304 pylvas2.Y = 200; 300 305 pylvas2.Restitution = 0.2; 301 306 pylvas2.Tag = "pylvas"; … … 305 310 pylvas2.Angle = Angle.FromDegrees(200.0); 306 311 307 PhysicsObject pylvas3 = PhysicsObject.CreateStaticObject(1 50.0, 50.0);308 pylvas3.Shape = Shape. Rectangle;309 pylvas3.X = -3 50;310 pylvas3.Y = - 110;312 PhysicsObject pylvas3 = PhysicsObject.CreateStaticObject(100.0, 100.0); 313 pylvas3.Shape = Shape.Circle; 314 pylvas3.X = -300; 315 pylvas3.Y = -200; 311 316 pylvas3.Restitution = 0.2; 312 317 pylvas3.Tag = "pylvas"; … … 316 321 pylvas3.Angle = Angle.FromDegrees(130.0); 317 322 318 PhysicsObject pylvas4 = PhysicsObject.CreateStaticObject(1 50.0, 50.0);319 pylvas4.Shape = Shape. Rectangle;320 pylvas4.X = 250;321 pylvas4.Y = -200;323 PhysicsObject pylvas4 = PhysicsObject.CreateStaticObject(100.0, 100.0); 324 pylvas4.Shape = Shape.Circle; 325 pylvas4.X = 100; 326 pylvas4.Y = 0; 322 327 pylvas4.Restitution = 0.2; 323 328 pylvas4.Tag = "pylvas"; … … 327 332 pylvas4.Angle = Angle.FromDegrees(200.0); 328 333 329 PhysicsObject pylvas5 = PhysicsObject.CreateStaticObject(1 50.0, 50.0);330 pylvas5.Shape = Shape. Rectangle;331 pylvas5.X = -275;332 pylvas5.Y = -2 70;334 PhysicsObject pylvas5 = PhysicsObject.CreateStaticObject(100.0, 100.0); 335 pylvas5.Shape = Shape.Circle; 336 pylvas5.X = 300; 337 pylvas5.Y = -200; 333 338 pylvas5.Restitution = 0.2; 334 339 pylvas5.Tag = "pylvas"; … … 338 343 pylvas5.Angle = Angle.FromDegrees(40.0); 339 344 340 PhysicsObject pylvas6 = PhysicsObject.CreateStaticObject(1 50.0, 50.0);341 pylvas6.Shape = Shape. Rectangle;342 pylvas6.X = 3 25;343 pylvas6.Y = 2 22;345 PhysicsObject pylvas6 = PhysicsObject.CreateStaticObject(100.0, 100.0); 346 pylvas6.Shape = Shape.Circle; 347 pylvas6.X = 300; 348 pylvas6.Y = 200; 344 349 pylvas6.Restitution = 0.2; 345 350 pylvas6.Tag = "pylvas"; … … 352 357 vasenReuna.Restitution = 0.3; 353 358 vasenReuna.IsVisible = true; 354 vasenReuna.Image = raja;359 //vasenReuna.Image = raja; 355 360 356 361 oikeaReuna = Level.CreateRightBorder(); 357 362 oikeaReuna.Restitution = 0.3; 358 363 oikeaReuna.IsVisible = true; 359 oikeaReuna.Image = raja;364 //oikeaReuna.Image = raja; 360 365 361 366 PhysicsObject ylaReuna = Level.CreateTopBorder(); 362 367 ylaReuna.Restitution = 0.3; 363 368 ylaReuna.IsVisible = true; 364 ylaReuna.Image = raja;369 //ylaReuna.Image = raja; 365 370 366 371 PhysicsObject alaReuna = Level.CreateBottomBorder(); 367 372 alaReuna.Restitution = 0.3; 368 373 alaReuna.IsVisible = true; 369 alaReuna.Image = raja;370 371 Level.BackgroundColor = Color. ForestGreen;374 //alaReuna.Image = raja; 375 376 Level.BackgroundColor = Color.DarkGray; 372 377 373 378 Level.Background.Image = kentta; … … 375 380 Camera.X = 0.0; 376 381 Camera.Y = 0.0; 377 Camera.ZoomFactor = 1.1; 378 379 pylvas1.Image = kiwi; 380 pylvas2.Image = kiwi; 381 pylvas3.Image = kiwi; 382 pylvas4.Image = kiwi; 383 pylvas5.Image = kiwi; 384 pylvas6.Image = kiwi; 385 maata.Image = kiwi; 382 Camera.ZoomFactor = 1.0 383 ; 384 385 pylvas1.Image = kiwi1; 386 pylvas2.Image = kiwi1; 387 pylvas3.Image = kiwi1; 388 pylvas4.Image = kiwi2; 389 pylvas5.Image = kiwi2; 390 pylvas6.Image = kiwi2; 391 //maata.Image = ; 386 392 387 393 } … … 452 458 { 453 459 MessageDisplay.Add("Punainen Voitti!"); 454 MessageDisplay.TextColor = Color. Pink;455 MessageDisplay.X = 560.0;456 MessageDisplay.Y = 470.0;460 MessageDisplay.TextColor = Color.Red; 461 MessageDisplay.X = 100.0; 462 MessageDisplay.Y = 360.0; 457 463 458 464 } … … 460 466 { 461 467 MessageDisplay.Add("Sininen Voitti!"); 462 MessageDisplay.TextColor = Color. Cyan;463 MessageDisplay.X = 565.0;464 MessageDisplay.Y = 520.0;468 MessageDisplay.TextColor = Color.DarkCyan; 469 MessageDisplay.X = 700.0; 470 MessageDisplay.Y = 360.0; 465 471 } 466 472 … … 502 508 } 503 509 504 if (auto2.Velocity.Magnitude > auto1.Velocity.Magnitude)505 {506 voimaMittari1.Value -= 5;507 }510 //if (auto2.Velocity.Magnitude > auto1.Velocity.Magnitude) 511 //{ 512 // voimaMittari1.Value -= 5; 513 //} 508 514 } 509 515 void KasitteleAuto2Tormays(PhysicsObject auto2, PhysicsObject kohde) … … 515 521 } 516 522 517 if (auto1.Velocity.Magnitude > auto2.Velocity.Magnitude)518 {519 voimaMittari2.Value -= 5;520 }523 //if (auto1.Velocity.Magnitude > auto2.Velocity.Magnitude) 524 //{ 525 // voimaMittari2.Value -= 5; 526 //} 521 527 } 522 528 void LisaaLaskurit() 523 529 { 524 pelaajan1Pisteet = LuoPisteLaskuri(- 605.0, 150.0);530 pelaajan1Pisteet = LuoPisteLaskuri(-100.0, 0.0); 525 531 pelaajan1Pisteet.UpperLimit += delegate { Voitto(auto1); }; 526 pelaajan2Pisteet = LuoPisteLaskuri( 605.0, 150.0);532 pelaajan2Pisteet = LuoPisteLaskuri(100.0, 0.0); 527 533 pelaajan2Pisteet.UpperLimit += delegate { Voitto(auto2); }; 528 534 } … … 535 541 naytto.X = x; 536 542 naytto.Y = y; 537 naytto.TextColor = Color. White;543 naytto.TextColor = Color.DarkGray; 538 544 Add(naytto); 539 545 return laskuri; … … 598 604 voikoPelaaja1Heittaa = false; 599 605 Grenade kranu = new Grenade(0.7); 600 kranu.FuseTime = TimeSpan.FromSeconds(0. 3);601 kranu.ExplosionRadius = 1 00;602 kranu.ExplosionForce = 300 ;603 kranu.ExplosionSpeed = 500;606 kranu.FuseTime = TimeSpan.FromSeconds(0.4); 607 kranu.ExplosionRadius = 125; 608 kranu.ExplosionForce = 3000; 609 kranu.ExplosionSpeed = 200; 604 610 kranu.MaximumLifetime = TimeSpan.FromSeconds(1); 605 611 Add(kranu); 606 612 kranu.Position = auto.Position + Vector.FromLengthAndAngle(35, (auto.Angle + Angle.FromDegrees(180))); 607 613 kranu.Angle = auto.Angle + Angle.FromDegrees(180); 608 Vector heittoVoima = Vector.FromLengthAndAngle( 6000, (auto.Angle + Angle.FromDegrees(180)));614 Vector heittoVoima = Vector.FromLengthAndAngle(10000, (auto.Angle + Angle.FromDegrees(180))); 609 615 kranu.Hit(heittoVoima); 610 616 … … 623 629 voikoPelaaja2Heittaa = false; 624 630 Grenade kranu = new Grenade(0.7); 625 kranu.FuseTime = TimeSpan.FromSeconds(0. 3);626 kranu.ExplosionRadius = 1 00;627 kranu.ExplosionForce = 300 ;628 kranu.ExplosionSpeed = 500;631 kranu.FuseTime = TimeSpan.FromSeconds(0.4); 632 kranu.ExplosionRadius = 125; 633 kranu.ExplosionForce = 3000; 634 kranu.ExplosionSpeed = 200; 629 635 kranu.MaximumLifetime = TimeSpan.FromSeconds(1); 630 636 Add(kranu); 631 637 kranu.Position = auto.Position + Vector.FromLengthAndAngle(35, (auto.Angle + Angle.FromDegrees(180))); 632 638 kranu.Angle = auto.Angle + Angle.FromDegrees(180); 633 Vector heittoVoima = Vector.FromLengthAndAngle( 6000, (auto.Angle + Angle.FromDegrees(180)));639 Vector heittoVoima = Vector.FromLengthAndAngle(10000, (auto.Angle + Angle.FromDegrees(180))); 634 640 kranu.Hit(heittoVoima); 635 641 636 642 if (kranu != null) 637 643 { … … 639 645 AddCollisionHandler(kranu, KranaattiOsui); 640 646 } 641 Timer.SingleShot(2.0, delegate { voikoPelaaja 1Heittaa = true; });647 Timer.SingleShot(2.0, delegate { voikoPelaaja2Heittaa = true; }); 642 648 } 643 649 } … … 663 669 if (kohde == auto1) 664 670 { 665 voimaMittari1.Value -= 10;671 voimaMittari1.Value -= 20; 666 672 return; 667 673 } 668 674 if (kohde == auto2) 669 675 { 670 voimaMittari2.Value -= 10;676 voimaMittari2.Value -= 20; 671 677 return; 672 678 } … … 751 757 MessageDisplay.Add("Start!"); 752 758 MessageDisplay.TextColor = Color.White; 753 MessageDisplay.X = 610.0;754 MessageDisplay.Y = 500.0;759 MessageDisplay.X = 490.0; 760 MessageDisplay.Y = 350.0; 755 761 ajastin.Stop(); 756 762 ajastin.Reset(); -
2011/31/AleksiK/WorkingTitle/WorkingTitle/WorkingTitle.csproj.Debug.cachefile
r2561 r2583 10 10 Content\mud.xnb 11 11 Content\sand.xnb 12 Content\tiili.xnb13 12 Content\stone.xnb 14 13 Content\panos.xnb 14 Content\sinpyl.xnb 15 Content\punpyl.xnb 16 Content\muds.xnb -
2011/31/AleksiK/WorkingTitle/WorkingTitle/obj/x86/Debug/WorkingTitle.csproj.FileListAbsolute.txt
r2561 r2583 18 18 C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\mud.xnb 19 19 C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\sand.xnb 20 C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\tiili.xnb21 20 C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\stone.xnb 22 21 C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\panos.xnb 22 C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\sinpyl.xnb 23 C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\punpyl.xnb 24 C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\muds.xnb -
2011/31/AleksiK/WorkingTitle/WorkingTitle/obj/x86/Debug/cachefile-{5BE16854-838A-4380-8B3A-3416305E4ECD}-targetpath.txt
r2561 r2583 10 10 Content\mud.xnb 11 11 Content\sand.xnb 12 Content\tiili.xnb13 12 Content\stone.xnb 14 13 Content\panos.xnb 14 Content\sinpyl.xnb 15 Content\punpyl.xnb 16 Content\muds.xnb -
2011/31/AleksiK/WorkingTitle/WorkingTitleContent/WorkingTitleContent.contentproj
r2561 r2583 107 107 </ItemGroup> 108 108 <ItemGroup> 109 <Compile Include="tiili.png">110 <Name>tiili</Name>111 <Importer>TextureImporter</Importer>112 <Processor>TextureProcessor</Processor>113 </Compile>114 </ItemGroup>115 <ItemGroup>116 109 <Compile Include="stone.png"> 117 110 <Name>stone</Name> … … 134 127 </Compile> 135 128 </ItemGroup> 129 <ItemGroup> 130 <Compile Include="sinpyl.png"> 131 <Name>sinpyl</Name> 132 <Importer>TextureImporter</Importer> 133 <Processor>TextureProcessor</Processor> 134 </Compile> 135 </ItemGroup> 136 <ItemGroup> 137 <Compile Include="punpyl.png"> 138 <Name>punpyl</Name> 139 <Importer>TextureImporter</Importer> 140 <Processor>TextureProcessor</Processor> 141 </Compile> 142 </ItemGroup> 143 <ItemGroup> 144 <Compile Include="muds.png"> 145 <Name>muds</Name> 146 <Importer>TextureImporter</Importer> 147 <Processor>TextureProcessor</Processor> 148 </Compile> 149 </ItemGroup> 136 150 <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 137 151 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
2011/31/AleksiK/WorkingTitle/WorkingTitleContent/obj/x86/Debug/ContentPipeline.xml
r2561 r2583 36 36 <Options>None</Options> 37 37 <Output>C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\rajahdysEsimerkki.xnb</Output> 38 <Time>2011-08-0 4T09:49:56.6794183+03:00</Time>38 <Time>2011-08-05T11:50:10.1108419+03:00</Time> 39 39 </Item> 40 40 <Item> … … 90 90 <Options>None</Options> 91 91 <Output>C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\mud.xnb</Output> 92 <Time>2011-08-0 2T13:03:27.7284859+03:00</Time>92 <Time>2011-08-05T10:36:19.2728779+03:00</Time> 93 93 </Item> 94 94 <Item> … … 99 99 <Options>None</Options> 100 100 <Output>C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\sand.xnb</Output> 101 <Time>2011-08-03T11:54:55.3961155+03:00</Time> 102 </Item> 103 <Item> 104 <Source>tiili.png</Source> 105 <Name>tiili</Name> 106 <Importer>TextureImporter</Importer> 107 <Processor>TextureProcessor</Processor> 108 <Options>None</Options> 109 <Output>C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\tiili.xnb</Output> 110 <Time>2011-08-03T10:24:50.3425567+03:00</Time> 101 <Time>2011-08-05T10:34:40.7872423+03:00</Time> 111 102 </Item> 112 103 <Item> … … 126 117 <Options>None</Options> 127 118 <Output>C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\panos.xnb</Output> 128 <Time>2011-08-04T14:37:29.8365679+03:00</Time> 119 <Time>2011-08-05T11:58:01.9137559+03:00</Time> 120 </Item> 121 <Item> 122 <Source>sinpyl.png</Source> 123 <Name>sinpyl</Name> 124 <Importer>TextureImporter</Importer> 125 <Processor>TextureProcessor</Processor> 126 <Options>None</Options> 127 <Output>C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\sinpyl.xnb</Output> 128 <Time>2011-08-05T09:50:12.8312179+03:00</Time> 129 </Item> 130 <Item> 131 <Source>punpyl.png</Source> 132 <Name>punpyl</Name> 133 <Importer>TextureImporter</Importer> 134 <Processor>TextureProcessor</Processor> 135 <Options>None</Options> 136 <Output>C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\punpyl.xnb</Output> 137 <Time>2011-08-05T09:50:21.7063315+03:00</Time> 138 </Item> 139 <Item> 140 <Source>muds.png</Source> 141 <Name>muds</Name> 142 <Importer>TextureImporter</Importer> 143 <Processor>TextureProcessor</Processor> 144 <Options>None</Options> 145 <Output>C:\MyTemp\AleksiK\WorkingTitle\WorkingTitle\bin\x86\Debug\Content\muds.xnb</Output> 146 <Time>2011-08-05T11:11:10.2058915+03:00</Time> 129 147 </Item> 130 148 <BuildSuccessful>true</BuildSuccessful>
Note: See TracChangeset
for help on using the changeset viewer.