Changeset 7203 for 2016

Timestamp:

2016-06-08 09:01:44 (7 years ago)

Author:

jotapoti

Message:

ampuminen värjää kenttää & peli ei kaadu, jos yrittää ampua ilman asetta

Location:

2016/23/ohjaajat/Punasininen/Punasininen

Files:

• Punasininen/Player.cs (modified) (1 diff)
• Punasininen/Punasininen.cs (modified) (8 diffs)
• Punasininen/WeaponCrate.cs (modified) (1 diff)
• PunasininenContent/dungeon1.png (modified) (previous)

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

@@ -9 +9 @@
 public class Player : PlatformCharacter2
 {
+
+    Weapon Secondary;
+
     public Player(double leveys, double korkeus, Image pic, Color color)
         : base(leveys, korkeus)

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

@@ -15 +15 @@
     private Player blue;
     private Player red; 
-
     private Image bluepic;
     private Image redpic;
+
+    private Image pistolpic;
+
     DoubleMeter percentageTracker;
 
@@ -38 +40 @@
         ColorTileMap map = ColorTileMap.FromLevelAsset("dungeon1");
         map.SetTileMethod(Color.Black, LisaaTaso);
-        map.SetTileMethod(Color.FromHexCode("#FF0026FF"), delegate(Vector paikka, double leveys, double korkeus) { blue = CreatePlayer(paikka, leveys, korkeus, bluepic, Color.Blue, new Vector(-Screen.Width / 2 + 50, Screen.Height / 2 - 50)); });
+        map.SetTileMethod(Color.FromHexCode("#FF0026FF"), delegate(Vector paikka, double leveys, double korkeus) { blue = CreatePlayer(paikka, leveys, korkeus, bluepic, Color.Blue);});
         map.SetTileMethod(Color.FromHexCode("FFD800"), CreateWeaponCrate);
-        map.SetTileMethod(Color.Red, delegate(Vector paikka, double leveys, double korkeus) { red = CreatePlayer(paikka, leveys, korkeus, redpic, Color.Red, new Vector(Screen.Width / 2 - 50, Screen.Height / 2 - 50)); });
+        map.SetTileMethod(Color.Red, delegate(Vector paikka, double leveys, double korkeus) { red = CreatePlayer(paikka, leveys, korkeus, redpic, Color.Red); });
         map.Execute(TILE_SIZE, TILE_SIZE);
 
@@ -57 +59 @@
     void CreateWeaponCrate(Vector place, double width, double height)
     {
-        PhysicsObject crate = PhysicsObject.CreateStaticObject(width, height);
+        WeaponCrate crate = new WeaponCrate(width, height);
         crate.Position = place;
+        crate.Color = Color.DarkGray;
         Add(crate);
     }
@@ -71 +74 @@
     }
 
-    Player CreatePlayer(Vector paikka, double leveys, double korkeus, Image playerspic, Color playersColor, Vector trackerPosition)
+    Player CreatePlayer(Vector paikka, double leveys, double korkeus, Image playerspic, Color playersColor)
     {
         Player player = new Player(leveys, korkeus, playerspic, playersColor);
@@ -79 +82 @@
         AddCollisionHandler(player, "platform", delegate(PhysicsObject a, PhysicsObject b)
         {
-            ColorTile(a, b, percentageTracker);
+            ColorTile(a, b);
         });
+        AddCollisionHandler(player, "crate", delegate(PhysicsObject a, PhysicsObject b)
+        {
+            //((Player)a).Weapon = ((WeaponCrate)b).GiveWeapon();
+            ((Player)a).Weapon = GunLottery();
+            ((Player)a).Weapon.ProjectileCollision = BulletHitsSomething;
+            b.Destroy();
+        });
 
         return player;
     }
 
+    void BulletHitsSomething (PhysicsObject bullet, PhysicsObject target)
+    {
+        if (target.Tag == "platform")
+        {
+            // TODO bullet must know its owner
+            if (bullet.Color == Color.Blue)
+            {
+                ColorTile(blue, target);
+            }
+            else if (bullet.Color == Color.Red)
+            {
+                ColorTile(red, target);
+            }
+        }
+        bullet.Destroy();
+    }
+
+    Weapon GunLottery()
+    {
+        return new AssaultRifle(50, 50);
+    }
+
     void Win(Player player)
     {
-        Pause();
+       Pause();
         //Haluaisin tehdä tähän jonkinlaisen hauskan ponnahdusefektin jossain vaiheessa. Sellaisen napakan zoomin ja sitten boing. Hurdur.
        Camera.ZoomTo(player.Left, player.Bottom, player.Right, player.Top + 100);
@@ -102 +134 @@
     }
 
-    void ColorTile(PhysicsObject player, PhysicsObject platform, DoubleMeter tracker)
+    void ColorTile(PhysicsObject player, PhysicsObject platform)
     {
         platform.Color = player.Color;
 
         List<GameObject> colored = GetObjects(o => (o.Color == red.Color || o.Color == blue.Color) && (String)o.Tag == "platform");
-        tracker.Value = (double)colored.FindAll(o => o.Color == red.Color).Count/colored.Count * 100;
+        percentageTracker.Value = (double)colored.FindAll(o => o.Color == red.Color).Count/colored.Count * 100;
     }
 
@@ -117 +149 @@
         ControllerOne.Listen(Button.A, ButtonState.Pressed, Jump, "Pelaaja hyppää", red, JUMPSPEED);
         ControllerOne.ListenAnalog(AnalogControl.RightStick, 0.1, Aim, "Tähtää", red);
+        ControllerOne.ListenAnalog(AnalogControl.RightTrigger, 0.1, Shoot, "", red);
 
         ControllerTwo.ListenAnalog(AnalogControl.LeftStick, 0.1, Move, "Liikuta pelaajaa", blue);
         ControllerTwo.Listen(Button.A, ButtonState.Pressed, Jump, "Pelaaja hyppää", blue, JUMPSPEED);
         ControllerOne.ListenAnalog(AnalogControl.RightStick, 0.1, Aim, null, blue);
+        ControllerTwo.ListenAnalog(AnalogControl.RightTrigger, 0.1, Shoot, "", blue);
 
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Ohjeet");
@@ -132 +166 @@
         if (stick.StateVector.Magnitude > 0.15)
             player.Walk(stick.StateVector.X > 0 ? Direction.Right : Direction.Left);
+    }
+
+    void Shoot(AnalogState trigger, Player player)
+    {
+        if (player.Weapon != null)
+        {
+            PhysicsObject bullet = player.Weapon.Shoot();
+            if (bullet != null)
+            {
+                bullet.Color = player.Color;  
+            }
+        }
     }
 

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

@@ -9 +9 @@
 class WeaponCrate : PhysicsObject
 {
-    Weapon WeaponInside;
 
-    public WeaponCrate(double leveys, double korkeus, Weapon weaponInside, Image pic, Color color)
+    public WeaponCrate(double leveys, double korkeus)
         : base(leveys, korkeus)
     {
-        this.WeaponInside = weaponInside;
-        this.Color = color;
-        this.Image = pic;
+        Tag = "crate";
     }
 
+    /*
     public Weapon GiveWeapon()
     {
         this.Destroy();
-        return WeaponInside;
-    }
+    }*/
 }