Changeset 7224 for 2016

Timestamp:

2016-06-10 09:30:50 (7 years ago)

Author:

sieerinn

Message:

Loppusäädöt

Location:

2016/23/ohjaajat/Punasininen/Punasininen

Files:

• Punasininen/Punasininen.cs (modified) (6 diffs)
• Punasininen/WeaponCrate.cs (modified) (5 diffs)
• PunasininenContent/dungeon1.png (modified) (previous)

2016/23/ohjaajat/Punasininen/Punasininen/Punasininen/Punasininen.cs

@@ -123 +123 @@
             Win(percentageTracker.Value >= 50 ? red : blue);
             var restart = new Timer() { Interval = 5, IgnorePause = true };
-            restart.Timeout += () => { ClearAll(); Begin(); Pause(); };
+            restart.Timeout += RestartGame;
             restart.Start();
         };
@@ -186 +186 @@
         Add(player);
 
+        var glow = new GameObject(240, 240);
+        glow.Image = playersColor == redColor ? orangeGlow : blueGlow;
+        player.Add(glow);
+
         player.Weapon = new AssaultRifle(leveys * 1.5, korkeus * 1.5)
         {
@@ -222 +226 @@
     {
         int hurdur = RandomGen.NextInt(0, 3);
+        Image glow = player == red ? orangeGlow : blueGlow;
 
         switch (hurdur)
         {
             case 0:
-                player.Weapon = new RocketLauncher(player.Weapon.Width, player.Weapon.Height, player.Weapon.Image, player);
+                player.Weapon = new RocketLauncher(player.Weapon.Width, player.Weapon.Height, player.Weapon.Image, glow, player);
                 break;
             case 1:
-                player.Weapon = new GrenadeLauncher(player.Weapon.Width, player.Weapon.Height, player.Weapon.Image, player);
+                player.Weapon = new GrenadeLauncher(player.Weapon.Width, player.Weapon.Height, player.Weapon.Image, glow, player);
                 break;
             case 2:
-                player.Weapon = new LaserGun(player.Weapon.Width, player.Weapon.Height) { Image = player.Weapon.Image, ProjectileCollision = delegate (PhysicsObject a, PhysicsObject b) { ColorTile(a, b); a.Destroy(); }, AttackSound = null, MaxAmmoLifetime = TimeSpan.FromSeconds(4) };
+                player.Weapon = new SprayGun(player.Weapon.Width, player.Weapon.Height, player.Weapon.Image, glow, player);
                 break;
             default:
@@ -256 +261 @@
     }
 
+    void RestartGame()
+    {
+        cratePositions.Clear();
+        ClearAll();
+        Begin();
+        IsPaused = false;
+    }
+
     void Win(Player winner)
     {
@@ -285 +298 @@
         zoomTimer.IgnorePause = true;
         zoomTimer.Start();
-
-        cratePositions.Clear();
     }
 
@@ -323 +334 @@
 
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Ohjeet");
+        Keyboard.Listen(Key.F12, ButtonState.Pressed, RestartGame, null);
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, Exit, "Lopeta");
 

2016/23/ohjaajat/Punasininen/Punasininen/Punasininen/WeaponCrate.cs

@@ -16 +16 @@
 }
 
+class SprayGun : LaserGun
+{
+    private Image glowImage;
+
+    public SprayGun(double leveys, double korkeus, Image image, Image glowImage, Player owner)
+        : base(leveys, korkeus)
+    {
+        this.glowImage = glowImage;
+        Image = image;
+        ProjectileCollision = (PhysicsObject a, PhysicsObject b) =>
+        {
+            ((Punasininen)Game).ColorTile(a, b); a.Destroy();
+        };
+        AttackSound = null;
+        MaxAmmoLifetime = TimeSpan.FromSeconds(4);
+    }
+
+    protected override PhysicsObject CreateProjectile()
+    {
+        var bullet = base.CreateProjectile();
+        var glow = new GameObject(100, 100);
+        glow.Image = glowImage;
+        bullet.Add(glow);
+        return bullet;
+    }
+}
+
 class RocketLauncher : AssaultRifle
 {
     public Player Owner;
 
-    public RocketLauncher(double leveys, double korkeus, Image image, Player owner)
+    private Image glowImage;
+
+    public RocketLauncher(double leveys, double korkeus, Image image, Image glowImage, Player owner)
         : base(leveys, korkeus)
     {
+        this.glowImage = glowImage;
         Image = image;
         AttackSound = null;
@@ -38 +68 @@
         rocket.Color = Owner.Color;
 
+        var rocketGlow = new GameObject(300, 300);
+        rocketGlow.Image = glowImage;
+        Game.Instance.Add(rocketGlow);
+
         ((Punasininen)Game.Instance).AddCollisionHandler(rocket, (PhysicsObject a, PhysicsObject b) =>
         {
@@ -50 +84 @@
         updateTimer.Timeout += () =>
         {
+            rocketGlow.Position = rocket.Position;
             rocket.Velocity *= 1.03;
 
@@ -72 +107 @@
             explosionTimer.Stop();
             rocket.Destroy();
+            rocketGlow.Destroy();
 
             var explosion = new Explosion(100);
@@ -98 +134 @@
     public Player Owner;
 
-    protected override PhysicsObject CreateProjectile()
-    {
-        Grenade test = new Grenade(10, TimeSpan.FromSeconds(1));
-        test.Explosion.ShockwaveColor = Owner.Color;
-        test.Explosion.MaxRadius = 300;
-        test.Explosion.Speed = 1000;
-        test.Explosion.Sound = null;
-        test.Explosion.ShockwaveReachesObject += delegate(IPhysicsObject a, Vector b) 
-        {
-            if (a is Tile)
-            {
-                ((Punasininen)Game).ColorTile(test, (Tile)a);
-            }
-        };
-        Timer.SingleShot(1, () => ((Punasininen)Game.Instance).NewWave(test.Position));
-        return test;
-    }
+    private Image glowImage;
 
-    public GrenadeLauncher(double leveys, double korkeus, Image image, Player owner)
+    public GrenadeLauncher(double leveys, double korkeus, Image image, Image glowImage, Player owner)
         : base(leveys, korkeus)
     {
+        this.glowImage = glowImage;
         Image = image;
         AttackSound = null;
         FireRate = 1;
         Power.DefaultValue = 30000;
-        Owner = owner;
-       
+        Owner = owner;  
     }
+
+    protected override PhysicsObject CreateProjectile()
+    {
+        Grenade grenade = new Grenade(10, TimeSpan.FromSeconds(1));
+        grenade.Explosion.ShockwaveColor = Owner.Color;
+        grenade.Explosion.MaxRadius = 300;
+        grenade.Explosion.Speed = 1000;
+        grenade.Explosion.Sound = null;
+        grenade.Explosion.ShockwaveReachesObject += delegate(IPhysicsObject a, Vector b) 
+        {
+            if (a is Tile)
+            {
+                ((Punasininen)Game).ColorTile(grenade, (Tile)a);
+            }
+        };
+        Timer.SingleShot(1, () => ((Punasininen)Game.Instance).NewWave(grenade.Position));
+
+        var glow = new GameObject(400, 400);
+        glow.Image = glowImage;
+        grenade.Add(glow);
+
+        return grenade;
+    }
+
 }