Changeset 3819 for 2012/30

Timestamp:

2012-07-27 12:51:21 (11 years ago)

Author:

otelretu

Message:

Talletus.

Location:

2012/30/OtsoR/Projekti

Files:

• Projekti.suo (modified) (previous)
• Projekti/Projekti/Projekti.cs (modified) (15 diffs)
• Projekti/Projekti/Projekti.csproj.Debug.cachefile (modified) (1 diff)
• Projekti/Projekti/bin/x86/Debug/Projekti.exe (modified) (previous)
• Projekti/Projekti/bin/x86/Debug/Projekti.pdb (modified) (previous)
• Projekti/Projekti/obj/x86/Debug/Projekti.csproj.FileListAbsolute.txt (modified) (1 diff)
• Projekti/Projekti/obj/x86/Debug/Projekti.exe (modified) (previous)
• Projekti/Projekti/obj/x86/Debug/Projekti.pdb (modified) (previous)
• Projekti/Projekti/obj/x86/Debug/cachefile-{97999162-0C3B-480A-AB91-BD553A4EB51F}-targetpath.txt (modified) (1 diff)
• Projekti/ProjektiContent/ProjektiContent.contentproj (modified) (1 diff)
• Projekti/ProjektiContent/s101.png (added)

2012/30/OtsoR/Projekti/Projekti/Projekti/Projekti.cs

@@ -14 +14 @@
 
     String[] weaponnames = { "projectile","laser","plasma" };
+
+    PhysicsObject topedge;
+    PhysicsObject bottomedge;
+    PhysicsObject leftedge;
+    PhysicsObject rightedge;
     
     PhysicsObject ship;
@@ -19 +24 @@
     PhysicsObject ship2;
     Weapon weapon2;
-
     PhysicsObject hostile;
     Weapon hostilew;
@@ -35 +39 @@
     IntMeter shipcolor2;
     IntMeter shipwpn2;
+    int shipcounter;
     public override void Begin()
     {
@@ -41 +46 @@
             shipimages[i-1] = LoadImage("s"+i);
         }
-
         IsMouseVisible = true;
         MultiSelectWindow numberofplayersmenu = new MultiSelectWindow("Select number of players", "1 Player", "2 Players", "Quit");
@@ -54 +58 @@
                 ClearAll();
                 singleplayer();
-                
                 break;
             case 1:
@@ -144 +147 @@
         choice(shipwpn.Value);
         ship.Add(weapon);
+        ship.CollisionIgnoreGroup = 1;
     }
     void Createship2()
@@ -157 +161 @@
         choice2(shipwpn2.Value);
         ship2.Add(weapon2);
-    }
-    void Createhostile()
-    {
-        hostile = new PhysicsObject(16, 16, Shape.FromImage(Aluskuva.Image));
-        hostile.Image = Aluskuva.Image;
-        hostile.Y = 100;
+        ship2.CollisionIgnoreGroup = 1;
+    }
+    void Spawnhostiles()
+    {
+        int shipcounter = 0;
+
+        while (shipcounter < 5)
+        {
+        int hostileship = RandomGen.NextInt(0, 100);
+        double hostiley = 0.0;
+        double hostilex = 0.0;
+        if (RandomGen.NextBool())
+        {
+            hostiley = Level.Bottom + 2 * Level.Top * RandomGen.NextInt(0, 2);
+            hostilex = RandomGen.NextDouble(Level.Left, Level.Right);
+        }
+        else
+        {
+            hostiley = RandomGen.NextDouble(Level.Bottom, Level.Top);
+            hostilex = Level.Left + 2 * Level.Right * RandomGen.NextInt(0, 2);
+
+        }
+        Createhostile(hostileship, hostiley, hostilex);
+        shipcounter++;
+        }
+    }
+    void Createhostile(int randomship, double randomy, double randomx)
+    {
+        hostile = new PhysicsObject(16, 16, Shape.FromImage(shipimages[randomship]));
+        hostile.Image = shipimages[randomship];
+        hostile.Y = randomy;
+        hostile.X = randomx;
         hostile.Restitution = 1.0;
         hostile.KineticFriction = 0.0;
@@ -168 +198 @@
         hostile.LinearDamping = 0.95;
         hostile.AngularDamping = 1;
+        hostile.Tag = "hostile";
         Add(hostile);
-        hostilew = new AssaultRifle(0, 0);
+        hostile.CollisionIgnoreGroup = 2;
+        hostile.Image.ReplaceColor(Color.White, Color.Ultramarine);
+        hostile.Image.ReplaceColor(Color.Black, Color.Emerald);
+
+        AssaultRifle hostilew = new AssaultRifle(0, 0);
         hostilew.ProjectileCollision = weaponhit;
+        hostilew.FireRate = 0.5;
         hostile.Add(hostilew);
 
-        RandomMoverBrain RandomAivot = new RandomMoverBrain(10);
-        RandomAivot.ChangeMovementSeconds = 3;
-        RandomAivot.TurnWhileMoving = true;
-
-        FollowerBrain SeuraavatAivot = new FollowerBrain(ship, ship2);
-        SeuraavatAivot.Speed = 10;
-        SeuraavatAivot.DistanceFar = 10000;
-        SeuraavatAivot.DistanceClose = 300;
-        SeuraavatAivot.StopWhenTargetClose = false;
-        SeuraavatAivot.FarBrain = RandomAivot;
-        SeuraavatAivot.TargetClose += delegate { firehostile(hostilew); };
-        SeuraavatAivot.TurnWhileMoving = true;
-        hostile.Brain = SeuraavatAivot;
-    }
-    void firehostile(Weapon weapon)
-    {
-        fire(weapon);
+        FollowerBrain brain = new FollowerBrain(ship, ship2);
+        brain.Speed = 20;
+        brain.DistanceFar = 10000;
+        brain.DistanceClose = 200;
+        brain.StopWhenTargetClose = false;
+        brain.TargetClose += delegate { fire(hostilew); };
+        brain.TurnWhileMoving = true;
+        hostile.Brain = brain;
+    }
+    void createedges()
+    {
+        PhysicsObject leftedge = Level.CreateLeftBorder();
+        leftedge.Restitution = 1.0;
+        leftedge.KineticFriction = 0.0;
+        leftedge.IsVisible = false;
+        leftedge.CollisionIgnoreGroup = 2;
+        PhysicsObject rightedge = Level.CreateRightBorder();
+        rightedge.Restitution = 1.0;
+        rightedge.KineticFriction = 0.0;
+        rightedge.IsVisible = false;
+        rightedge.CollisionIgnoreGroup = 2;
+        PhysicsObject topedge = Level.CreateTopBorder();
+        topedge.Restitution = 1.0;
+        topedge.KineticFriction = 0.0;
+        topedge.IsVisible = false;
+        topedge.CollisionIgnoreGroup = 2;
+        PhysicsObject bottomedge = Level.CreateBottomBorder();
+        bottomedge.Restitution = 1.0;
+        bottomedge.IsVisible = false;
+        bottomedge.KineticFriction = 0.0;
+        topedge.CollisionIgnoreGroup = 2;
     }
     void coop()
@@ -291 +341 @@
                 weapon = new AssaultRifle(0, 0);
                 weapon.ProjectileCollision = weaponhit;
+                weapon.FireRate = 4;
                 break;
             case 2:
                 weapon = new LaserGun(0, 0);
                 weapon.ProjectileCollision = weaponhit;
-                weapon.Power.Value = 5000;
-                weapon.FireRate = 1.0;
+                weapon.FireRate = 0.5;
                 break;
             case 3:
                 weapon = new PlasmaCannon(0, 0);
                 weapon.ProjectileCollision = weaponhit;
+                weapon.FireRate = 2;
                 break;
         }
@@ -311 +362 @@
                 weapon2 = new AssaultRifle(0, 0);
                 weapon2.ProjectileCollision = weaponhit;
+                weapon2.FireRate = 4;
                 break;
             case 2:
                 weapon2 = new LaserGun(0, 0);
                 weapon2.ProjectileCollision = weaponhit;
-                weapon2.Power.Value = 5000;
-                weapon2.FireRate = 1.0;
+                weapon2.FireRate = 0.5;
                 break;
             case 3:
                 weapon2 = new PlasmaCannon(0, 0);
                 weapon2.ProjectileCollision = weaponhit;
+                weapon2.FireRate = 2;
                 break;
         }
@@ -327 +379 @@
     {
         PhysicsObject ammus = ase.Shoot();
-        
+
+
         if (ammus != null)
         {
+             //Add(ammus, 2);
             //ammus.Size *= 3;
             //ammus.Image = 
@@ -335 +389 @@
         }
     }
+
     void weaponhit(PhysicsObject ammus, PhysicsObject kohde)
     {
+        if (kohde.Tag == "hostile") kohde.Destroy();
         ammus.Destroy();
     }
-    void AsetaOhjaimet()
+
+    void Controlsship1()
     {
         Keyboard.Listen(Key.W, ButtonState.Down, thrust, "", 1.0, ship);
@@ -345 +402 @@
         Keyboard.Listen(Key.A, ButtonState.Down, tilt, "", 1.0, ship);
         Keyboard.Listen(Key.D, ButtonState.Down, tilt, "", -1.0, ship);
-        Keyboard.Listen(Key.Space, ButtonState.Down, fire, "", weapon);
-
+        Keyboard.Listen(Key.F, ButtonState.Down, fire, "", weapon);
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
-
+    }
+    void Controlsship2()
+    {
         Keyboard.Listen(Key.NumPad8, ButtonState.Down, thrust, "", 1.0, ship2);
         Keyboard.Listen(Key.NumPad5, ButtonState.Down, thrust, "", -1.0, ship2);
         Keyboard.Listen(Key.NumPad4, ButtonState.Down, tilt, "", 1.0, ship2);
         Keyboard.Listen(Key.NumPad6, ButtonState.Down, tilt, "", -1.0, ship2);
-        Keyboard.Listen(Key.Space, ButtonState.Down, fire, "", weapon2);
+        Keyboard.Listen(Key.Add, ButtonState.Down, fire, "", weapon2);
     }
     void thrust(double direction, PhysicsObject ship)
@@ -371 +429 @@
         Camera.ZoomToLevel();
         Createship();
-        AsetaOhjaimet();
+        Controlsship1();
     }
     void coopbase()
@@ -381 +439 @@
         Createship();
         Createship2();
-        Createhostile();
-        AsetaOhjaimet();
+        Spawnhostiles();
+        Controlsship1();
+        Controlsship2();
+
+        Timer a = new Timer();
+        a.Interval = 5;
+        a.Timeout += Spawnhostiles;
+        a.Start();
     }
 }

2012/30/OtsoR/Projekti/Projekti/Projekti/Projekti.csproj.Debug.cachefile

@@ -99 +99 @@
 Content\s98.xnb
 Content\s99.xnb
+Content\s101.xnb
+Content\bullet.xnb

2012/30/OtsoR/Projekti/Projekti/Projekti/obj/x86/Debug/Projekti.csproj.FileListAbsolute.txt

@@ -107 +107 @@
 C:\MyTemp\OtsoR\Projekti\Projekti\Projekti\bin\x86\Debug\Content\s98.xnb
 C:\MyTemp\OtsoR\Projekti\Projekti\Projekti\bin\x86\Debug\Content\s99.xnb
+C:\MyTemp\OtsoR\Projekti\Projekti\Projekti\bin\x86\Debug\Content\bullet.xnb

2012/30/OtsoR/Projekti/Projekti/Projekti/obj/x86/Debug/cachefile-{97999162-0C3B-480A-AB91-BD553A4EB51F}-targetpath.txt

@@ -99 +99 @@
 Content\s98.xnb
 Content\s99.xnb
+Content\bullet.xnb

2012/30/OtsoR/Projekti/Projekti/ProjektiContent/ProjektiContent.contentproj

@@ -546 +546 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="bullet.png">
+      <Name>bullet</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.